tree 9753016e50c3268e4e72d7053d4c27afe184c112
parent 0bfdfad1a9a820d5f15fe10f5205978f63aeef3d
parent 4199fe0d9c9ff23ef50a25a806468a0a9f51a196
author Paul Duffin <paulduffin@google.com> 1484753565 +0000
committer android-build-merger <android-build-merger@google.com> 1484753565 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 3c371ed8e4
am: 4199fe0d9c

Change-Id: Ib0d8a55ba985937ab1a7a6f1cdf9d079697b815e