| commit | 2598f0ad55044c92553e45a5d46ee7e91ba4a7fe | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 09 18:28:05 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Dec 09 18:28:05 2014 -0800 |
| tree | 5afe679fb712b0168db0d8c426c95ecc3b069d74 | |
| parent | a5f2da5012f06184b1c4633e4b1c3e38fd201a19 [diff] | |
| parent | 02ef15f1d7cc6f47b041eb34e7d9d2ef37ff866d [diff] |
resolved conflicts for merge of 02ef15f1 to lmp-mr1-dev-plus-aosp Change-Id: If44376782436b92c2d03a56df57572fc964158a9