OSDN Git Service

resolve merge conflicts of 3ceaacc to stage-aosp-master am: 04b63e5ab2 am: 396aadae6f...
authorsqian <shuoq@google.com>
Tue, 15 Aug 2017 19:37:32 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 19:37:32 +0000 (19:37 +0000)
commitfc85197d71aa7e34727b649ae14fcfdd3690ba8b
treef22eb858866592d1ba43523b471b354efba4e168
parent92433c4a2bf73488abe85d8b5065e838df51523e
parentf6b2c113df7588af368eba43ff4024fd8736c0fb
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