| commit | b307dcd8715ea4ffa456d819e8e8812719d5e760 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue Oct 14 11:05:28 2014 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Tue Oct 14 11:05:28 2014 -0700 |
| tree | 067a95fcc95bb726528523ec07033a91ed87fd41 | |
| parent | 5d678db3c63992ff9fb0b2b2ed6126ef0fe79ef8 [diff] | |
| parent | 3f95c89db68f4d609c0ccafa4e9e7376852c9b48 [diff] |
resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp Change-Id: Iac27dc93675c3111129fc594eaaff7f1d6f5c26f