OSDN Git Service

Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 5 Jul 2017 21:24:07 +0000 (21:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Jul 2017 21:24:07 +0000 (21:24 +0000)
commit165f684a63cb3d1d92ba829b2ecff82182f32ed2
treeb76b72443d15d82d6d49aea5aafcf62fa69bb5ef
parent036989452d8aaaebbfcb3e775a80450d5fdb1adc
parent6504e15b3f1272684c073ab41fa9aebb9b73b2bb
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours am: 8f09557150  -s ours" into oc-dr1-dev-plus-aosp