| commit | a04db92d34ca1e8136fecd37dcdfde3e5d299f65 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 27 21:57:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 27 21:57:46 2016 +0000 |
| tree | 3ed431cf4a7c6e3c5e91effdfb8a3ca4ac11724c | |
| parent | de5e34bfad636fe8c748cd881ee0859cd0c02d14 [diff] | |
| parent | d0ad1052e9ecb32276b07f7042ad3bc9ebb240f5 [diff] |
resolve merge conflicts of d1b3669 to stage-aosp-master am: 5b2880ad91 am: a4faeeef90 am: d0ad1052e9 Change-Id: Ib1c96d12a5d5139f9bad804f48bb9742e28da234