OSDN Git Service

Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd067...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)
commit9f27717e72a1c0733e9a35f93c1105da025de24b
treeb76b72443d15d82d6d49aea5aafcf62fa69bb5ef
parentdad1aa3e11f2089a44564760eb1c48aeea8e99e4
parent530a622f60ea6c920ba8d392ea02eaa9b42e8f5e
Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours" into stage-aosp-master am: a998cffb1b  -s ours" into oc-dev-plus-aosp
am: 530a622f60  -s ours

Change-Id: I0bf2d7461e65989758cb0575c1b1cb6ae238dd9f