tree 76ba1a36294b2668926911b08a0c52645e344399
parent e2385a425de395aa06e2a7421b7f38b0909d44d6
parent 60d4545611ade0fffec6a618779fffce27e1ca35
author Paul Duffin <paulduffin@google.com> 1484757686 +0000
committer android-build-merger <android-build-merger@google.com> 1484757686 +0000

Merge "Prepare for removal of legacy-test from default targets" am: a691d6c012 am: 1fc636d62b am: 488ffd1db1
am: 60d4545611

Change-Id: If8d5ee3ac45308c0a154c828286eff5939e92293