tree 431c29a6458f25bd3a41e26b4085833afbfebfde
parent db9e56344d2ef16618aa7227058028229d410431
parent 9b345b59913416a7e86f65e993ed6cc1722c6541
author Paul Duffin <paulduffin@google.com> 1484752182 +0000
committer android-build-merger <android-build-merger@google.com> 1484752182 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935 am: 043c5d763b
am: 9b345b5991

Change-Id: I00e5624f3f400b9f5563c5fb8167bb4ecc5bfb81