tree 1ce19b70051ab9cc131844f58aa7bb0e972853c8
parent 96d0a80af45923767baf449fc8c735c2f71d64ae
parent 01a7c93fd026612443029367ef91ee67f0d64184
author Paul Duffin <paulduffin@google.com> 1484753252 +0000
committer android-build-merger <android-build-merger@google.com> 1484753252 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 382bc45b8f am: 90b8532341
am: 01a7c93fd0

Change-Id: If04330753c5c354d2c140b9d2fecf08dd119bb55