| commit | 548bb3d3521eee5b9f34b2860c698cb0c5226e27 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Oct 02 06:36:41 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 02 06:43:47 2014 +0000 |
| tree | 52c396bb586f8852ae86f59a526eea2f5f67dab4 | |
| parent | 06b4f4589992886b59b1f1858c13abf7fe239eef [diff] | |
| parent | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c [diff] |
Merge "resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp