tree 1ce19b70051ab9cc131844f58aa7bb0e972853c8
parent 96d0a80af45923767baf449fc8c735c2f71d64ae
parent 5dffc10ad0c9be63e7499378a82db55165e6f046
author Paul Duffin <paulduffin@google.com> 1484753591 +0000
committer android-build-merger <android-build-merger@google.com> 1484753591 +0000

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

Change-Id: I2d7cea8d3247d2c8850ebf6518293fa1a5eb424d