tree 7773c8f10457c6f6bb29f14ef0063b49beec9bff
parent 81fd5ec69e67cd7f271a99050f5caf7584414fca
parent 5bf18e684d354a40c1a3283fc52608ce7c031253
author Android Build Merger (Role) <android-build-merger@google.com> 1499291030 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499291030 +0000

Merge "Merge "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" into oc-dr1-dev-plus-aosp am: 2d0f12c43e  -s ours"