| commit | fc85197d71aa7e34727b649ae14fcfdd3690ba8b | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Aug 15 19:37:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 19:37:32 2017 +0000 |
| tree | f22eb858866592d1ba43523b471b354efba4e168 | |
| parent | 92433c4a2bf73488abe85d8b5065e838df51523e [diff] | |
| parent | f6b2c113df7588af368eba43ff4024fd8736c0fb [diff] |
resolve merge conflicts of 3ceaacc to stage-aosp-master am: 04b63e5ab2 am: 396aadae6f -s ours am: a748e8e17e -s ours am: f6b2c113df -s ours Change-Id: If4b1c00455d67447919f9cc097dad24457eae503