tree 605e8afe4a230dc956db46e9f5c3ffb74b5d4890
parent ff7a2e43c4545bda638549369cd0550f04f22715
parent 488ffd1db1eb3a7cf88bc7780420f91df8842fb2
author Paul Duffin <paulduffin@google.com> 1484757465 +0000
committer android-build-merger <android-build-merger@google.com> 1484757465 +0000

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

Change-Id: I5677f7023129dcacba6babe73e6b047e27f879b3