tree e7dd6a41bbf6f3c68f18731062076f5206d9e472
parent 7d49cda8d07c17c9acd34e36190d6d3e7814a751
parent 595df4ca8e61294659f6fd73b0ec87194dc98e5e
author Adam Vartanian <flooey@google.com> 1499415032 +0000
committer android-build-merger <android-build-merger@google.com> 1499415032 +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
am: 595df4ca8e

Change-Id: I495ebe14aba461bb4fc296a1c50a90ea91d23c86