tree 6f4e30f6287ae5f9d6673c123495c9816f7ee3ad
parent cc6c17b8ed574bf72a2eab5a06b0f1ae29f43357
parent 4575cdcabf8ed13123aac31834d699536832ccd4
author Android Build Merger (Role) <android-build-merger@google.com> 1499414130 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499414130 +0000

Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master am: 9dcf614397" into oc-dev-plus-aosp am: 587eeda675" into oc-dr1-dev-plus-aosp