| commit | 45374c9afad9ddc21966239d38823bd214145d24 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Jul 17 17:16:49 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 17 16:16:48 2014 +0000 |
| tree | 7896a1c48839d58b4370c748a694435c4b3e2b23 | |
| parent | 7df3625d5bb28d11cce9ac23429f5e3c6ebac030 [diff] | |
| parent | efc81e7d5edaa096a90ec17516549f9df49899fa [diff] |
Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev