tree 510fce6eaf589e26cbc1d5ff2a2fba065e1049ad
parent 968719035deb1af1d0f683e920cdb20a02f93995
parent 777c5a3ea11a83e5e0d79ffff1298b4f16b726d5
author Paul Duffin <paulduffin@google.com> 1484921129 +0000
committer android-build-merger <android-build-merger@google.com> 1484921129 +0000

Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1
am: 2d7a0786b5

Change-Id: I3d450f4890825f5ad261b01ae9bd1a1b01a640c7