tree 276dba24bd8c53f325484c4497ecd8e0c7e8c403
parent 5b366468f22bb2e6f6c32adec01b71b1b47eadc8
parent 8be70727ed589616fbd2fff0c11635f2c5a61151
author Paul Duffin <paulduffin@google.com> 1484753239 +0000
committer android-build-merger <android-build-merger@google.com> 1484753239 +0000

Merge "Prepare for removal of legacy-test from default targets" am: ec6226a6e6 am: 1655131ad9
am: 8be70727ed

Change-Id: I28260538445d0b218ae629bf245f2067beef1263