tree 0e975714e1de338d8e4ffe4af3ac158be0224e6a
parent 52722312598636ca41bdf6cda593f5d018cfc970
parent 5a3a3d298a14903aa1cecb9024e33108b87daac1
author Paul Duffin <paulduffin@google.com> 1485274106 +0000
committer android-build-merger <android-build-merger@google.com> 1485274106 +0000

Merge "Prepare for removal of legacy-test from default targets (Part 2)"
am: 5a3a3d298a

Change-Id: I14fd4502454a98baf01f5ace83fe0c583005a52d