| commit | 220c3f4f48b53b6010093a1ef437f4197a382ebf | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 22:20:30 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 21 22:20:31 2014 +0000 |
| tree | 31c7b8a68b1463511f9647b3928890f50c72c82a | |
| parent | 79ef5ef7a58baf17f7c3522a5aeb041f5206c32a [diff] | |
| parent | 2ab8298dc37851aab4623ba3f98d71055d653a73 [diff] |
Merge "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp