| commit | b8794c76d677ef04c96b9edc002fe6e1f53022c7 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Jan 14 21:55:19 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 14 21:55:20 2015 +0000 |
| tree | bedffc1a17c5c37e534dc32c76bdf71e18ab2251 | |
| parent | e2b9d5b56c6b06418e85cd49afd87e0d08f57c71 [diff] | |
| parent | 29f4d9f9ea58c19c3c9ea624a0c88643eb48866d [diff] |
Merge "resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp