tree 9f522a771ebb72183a1e71e916fed54cd37e09eb
parent 8d81a74f197c70b01422901634c20d2fb810fa73
parent b584e2fa9fc3aa433afeeb31a5143a93e63b3900
author Paul Duffin <paulduffin@google.com> 1484751855 +0000
committer android-build-merger <android-build-merger@google.com> 1484751855 +0000

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

Change-Id: I387e39a10c2021a5d43fc88398495f8ced0e6fe2