tree 906a645bfb296bb08df5af3f26598b8e2b047047
parent 7d3754cb8144935ca8a9a1f879cc29076c4f642e
parent 6946d8aae50f9219a986ea45dee0bec2387e7591
author Paul Duffin <paulduffin@google.com> 1484749455 +0000
committer android-build-merger <android-build-merger@google.com> 1484749455 +0000

Merge "Prepare for removal of legacy-test from default targets"
am: 6946d8aae5

Change-Id: Iad4f18e7457becc3a6f8705669ea91ffa9ab7628