OSDN Git Service

Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:26:38 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:26:38 +0000 (21:26 +0000)
commitdad1aa3e11f2089a44564760eb1c48aeea8e99e4
treeb76b72443d15d82d6d49aea5aafcf62fa69bb5ef
parent165f684a63cb3d1d92ba829b2ecff82182f32ed2
parenteb20c5a9f4843083bd6af23fc933fcb92d7ce4fe
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours" into oc-dev-plus-aosp
am: eb20c5a9f4  -s ours

Change-Id: I5e4e3d86918830bbc13d60ecd8a3392d55ff2726