tree 629cf9dbf87040876a7c69b34be6eb05b31e14ca
parent a3aa0dc5db2dafcd41a8c93ac6aae686c562e1c0
parent 59aa290a93a9e9fcb3fb1f292b0e3a4f8b522132
author Paul Duffin <paulduffin@google.com> 1484749238 +0000
committer android-build-merger <android-build-merger@google.com> 1484749238 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 794a36fcb5
am: 59aa290a93

Change-Id: I6e386e587555c398f98510f5b03d0d6984ae9a58