tree 01beda71e9dbb3427471dc6534b4c96e70b6aaa1
parent a0ffccbbb8dd69ef97c44bbe28279d92eba5540e
parent 9ad7d0d4ae34663d7e25df58cc1290dec9472851
author Paul Duffin <paulduffin@google.com> 1484759235 +0000
committer android-build-merger <android-build-merger@google.com> 1484759235 +0000

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

Change-Id: I020ac951cc59af87b5c8b17297793f04aa6e11df