tree 5017f59cfb85f1dac90e2483863788e4fe56860c
parent 3f47856377406ce14cc43492808aa5f84cdf52e9
parent 886d7d1277b82347c30ec5d79ba1576680947bb8
author Paul Duffin <paulduffin@google.com> 1484751637 +0000
committer android-build-merger <android-build-merger@google.com> 1484751637 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089 am: f40b38da25 am: 6db7eaee89
am: 886d7d1277

Change-Id: I9fc9b526e1ce01ecf07c04d2f12e6f5c59c732f4