tree 9f522a771ebb72183a1e71e916fed54cd37e09eb
parent 53d64f47e3fb1d557850dd16c37ed223af0190c7
parent 15d297d8ac4664e4a491448d9c15158ee51714f9
author Paul Duffin <paulduffin@google.com> 1484752268 +0000
committer android-build-merger <android-build-merger@google.com> 1484752268 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 9c76321f9a am: 23650b2a78 am: b584e2fa9f
am: 15d297d8ac

Change-Id: Ied2e8c15cbf9e7499ac7da91f65db011f603c662