| commit | 32e9163b2ab439d3313adf8c03441e4ddfe0bb36 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 09 19:12:21 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Dec 09 19:12:21 2014 -0800 |
| tree | 9fa58e21a1276b2d8abb12f126949fd7c3e281d9 | |
| parent | b1d67c1db1bd3101de172e70cb2f19bfbba1e5a9 [diff] | |
| parent | cbdf4a95aa3120486f63954368a00c7797e573ee [diff] |
resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea