diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-03 14:52:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-03 14:52:16 +0000 |
| commit | 30436e7e6d3f2c8755a91b2b6222b74d465a9e87 (patch) | |
| tree | 4b95ce0d7cc704dfefa38a65e31325e246fcc963 /assets | |
| parent | 3775f56966a611e39df1ab7ea4bf083992588c4f (diff) | |
| parent | 054c5e6e85500d05a5d872d6064a812e937fa059 (diff) | |
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: dc8b745037 am: 8937acfca0
am: 054c5e6e85 -s ours
Change-Id: Iaaf7fb56e0f2e49f54d9b13a10a7ed2b50fde92f
Diffstat (limited to 'assets')
0 files changed, 0 insertions, 0 deletions