| commit | 49cb52e296c48613c2177bfcb14fc67e21b9ae03 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Oct 23 00:05:41 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 23 00:05:42 2014 +0000 |
| tree | 0a54ebdfc158126262336799776220eff7c86cee | |
| parent | 720f43e4a42ca5cb2544a049d3b60c53174df93a [diff] | |
| parent | fb1cf36aa739da5dbebc64e61900e9ff96134e26 [diff] |
Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev