tree 11a5cf9305c3a40277f5e41f0ecec37b6e43d593
parent ff85c56244912ccddbcc590b88980fe2971c6730
parent 9dcf61439737720983e860252440814f82236290
author Adam Vartanian <flooey@google.com> 1499413593 +0000
committer android-build-merger <android-build-merger@google.com> 1499413593 +0000

Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master
am: 9dcf614397

Change-Id: I2d9a30cb879a2b689f5519b8d4c066de1265f0df