| commit | 5a4b32fa5c73b710d934069fb18ffc75f92e0f2f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Aug 21 00:58:10 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 21 00:22:45 2014 +0000 |
| tree | 07fa3540e6e5c712d20a2c43e27478e0347fbb46 | |
| parent | 9d0a5fd90cb36ace27c30eac80b98f211e653513 [diff] | |
| parent | 3befd9c07435d3f89e59442deb511e0608d831f8 [diff] |
Merge "resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp