tree 0656b733e15da4c392af94b538ab5f4c0e72f1d3
parent 1ad9e89effea838e7a27a936e8ac51bf7526305b
parent 013c7a651595b426eed37699206695af469b644c
author Paul Duffin <paulduffin@google.com> 1484824687 +0000
committer android-build-merger <android-build-merger@google.com> 1484824687 +0000

Merge "Prepare for removal of legacy-test from default targets" am: e771ade10d
am: 013c7a6515

Change-Id: I5185a8f2ec2bfd17b79d3ef170dc3078d843e90a