tree 82e8828930cb93a06a28e0a2c80f259f7d2dc872
parent 304dba340c0ac9ad7e1db3b6a11888f9ac23e9a3
parent 63c6f8bcb4445ecb49bfe8396dd7452c016a9027
author Paul Duffin <paulduffin@google.com> 1484751318 +0000
committer android-build-merger <android-build-merger@google.com> 1484751318 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 5644a6ec76
am: 63c6f8bcb4

Change-Id: Ic3283992689de0d8edb59fd7f331833bfdcb0c2e