tree 82e8828930cb93a06a28e0a2c80f259f7d2dc872
parent c875e20fc42286cd403efa222848885c90fd73d2
parent ea01c26e028123265faf6a031f81b400ce1db26a
author Paul Duffin <paulduffin@google.com> 1484758790 +0000
committer android-build-merger <android-build-merger@google.com> 1484758790 +0000

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

Change-Id: I384097f4dce1f68c9e880e8f2f04f01f4e791c58