tree 97d2d2b6714ca96f0051c296d99f72d111269847
parent 755cb99713078ad9d9a154926c5769a78f69e43f
parent d166148abab4af9111e325a859f86d58e2a04c0b
author Paul Duffin <paulduffin@google.com> 1484752609 +0000
committer android-build-merger <android-build-merger@google.com> 1484752609 +0000

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

Change-Id: I251673fa685efcb91b7c0159ff6172faade2dc98