tree 0438de8ac08b0d628683f5a4e17513afe577cea4
parent e4fe6c283f6d200def5d6b0f5646a1fa4d0683bb
parent 5aa7e5b46fe16f3772af0b7248d2289239f8419c
author Paul Duffin <paulduffin@google.com> 1485274723 +0000
committer android-build-merger <android-build-merger@google.com> 1485274723 +0000

Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a am: a07f9d522b
am: 5aa7e5b46f

Change-Id: I6aede1f1e2216233493cebe3efba43686aa3ad0d