tree c184e785e2e23dd39067e7f1538bbef61f192722
parent 80e3b79f2a9395bb6847fa3f45283b05f0177e57
parent 44c1afdc7fe9f4420933ad0c9fd824931179ca27
author Paul Duffin <paulduffin@google.com> 1484752599 +0000
committer android-build-merger <android-build-merger@google.com> 1484752599 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935 am: 043c5d763b am: 9b345b5991
am: 44c1afdc7f

Change-Id: Id3528148be3678f3fc9eac56943607742e377076