OSDN Git Service

Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd067...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 5 Jul 2017 21:30:03 +0000 (21:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Jul 2017 21:30:03 +0000 (21:30 +0000)
commit11dc56bd83d70a5149b653361c6af12d37a174e3
treeb76b72443d15d82d6d49aea5aafcf62fa69bb5ef
parent9f27717e72a1c0733e9a35f93c1105da025de24b
parentfbdfc316178a4d46b383bd3fd3dd703d187d3a6b
Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours" into oc-dev-plus-aosp am: eb20c5a9f4  -s ours" into oc-dr1-dev-plus-aosp