diff options
author | Tina Zhou <tinazh@google.com> | 2017-02-21 22:03:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 22:03:31 +0000 |
commit | 7c13b8f63eb77272219978a700dfe0d34111c23e (patch) | |
tree | 5244ea4acca644b7875ec7f81b1cd58328efe354 /annotations/generate_annotated_java_files.py | |
parent | 3e2bb7d3abf3d2016b71054b04cb481e79931d6b (diff) | |
parent | 8ba87b0c28928697f9187c38b7583b3f586f39ca (diff) |
Merge "Do not run test requiring 3GB free space on devices that do not have it" into nougat-mr1-cts-dev
am: 8ba87b0c28 -s ours
Change-Id: Id32df3ce516dfdd700b843c50a09f7b90e27479b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions