| commit | a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Dec 04 13:41:04 2014 -0800 |
| committer | John Reck <jreck@google.com> | Thu Dec 04 13:41:04 2014 -0800 |
| tree | aef030b2f3b65e829e3569a0b0304b609f1c856c | |
| parent | 1c88fc009fb3f7a3b5f085abb6a40cf4d845d662 [diff] | |
| parent | a51a0901ada5e2bc472c379a39df13ff48e666ed [diff] |
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed