| commit | b3325cbb267da0e663742fec172d7ed7ffe2aa1f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Jul 17 17:51:43 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 17 16:16:48 2014 +0000 |
| tree | 2feec5f443a62569d9c8104ad81908d63bba2ccb | |
| parent | a1b6cfd719b64391700b2f42261ee402c2c62e3f [diff] | |
| parent | aa9b0f15753541ff8e4d62e6497c11800c737077 [diff] |
Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev