tree bbfabb752a2fe718a642117a79fd22b5366c6621
parent 79171ff1cb60c83a020cae25c73b415c6812a90e
parent 5ad3c04da52e2c5471e2f4f7f31eb0c6007d492f
author Paul Duffin <paulduffin@google.com> 1484752444 +0000
committer android-build-merger <android-build-merger@google.com> 1484752444 +0000

Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1 am: 4ffb04dd9d
am: 5ad3c04da5

Change-Id: I3260d93518620536d59fae5fbc5dbbcf7905b593