tree 1ce19b70051ab9cc131844f58aa7bb0e972853c8
parent 96d0a80af45923767baf449fc8c735c2f71d64ae
parent 382bc45b8faf3656ff89c3cff7383d3536895565
author Paul Duffin <paulduffin@google.com> 1484749754 +0000
committer android-build-merger <android-build-merger@google.com> 1484749754 +0000

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

Change-Id: Idf36ada067101f5cdf7398c0c84bc4ab72564841