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

Merge "Prepare for removal of legacy-test from default targets"
am: a7094d8ed1

Change-Id: I05173764ce543ae76e68a17c1f7d24be7ccfa87b