| commit | 512201b9569e4b4b21be993523cac465ac4cf435 | [log] [tgz] |
|---|---|---|
| author | Kevin Ma <kma@google.com> | Sat Jul 19 01:50:59 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 17 21:09:48 2014 +0000 |
| tree | 37a145ee89bc85218608bffd86d9ce950c16d594 | |
| parent | 416e148359a3d56dec0183ea8785c390811f7308 [diff] | |
| parent | d95fbc003932eb6791277f2ca4394eb021ede0fa [diff] |
Merge "resolved conflicts for merge of c6e305c8 to lmp-dev" into lmp-dev