diff options
author | Android Merger <noreply-android-build-merger@google.com> | 2018-01-11 15:48:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-11 15:48:28 +0000 |
commit | 438a18a9bb17fa8593b836d942dcae98a012f758 (patch) | |
tree | 6f57052d1923e2400deea2690e28b578ed1c835a /annotations/generate_annotated_java_files.py | |
parent | cf80fdd066b8b2e7b3e8e339bd6669fd80c7daf0 (diff) | |
parent | 026d5f54517e8d76a50c24bd94695ece3970bce0 (diff) |
Merge "Merge "Do not run test requiring 3GB free space on devices that do not have it" into nougat-cts-dev am: 65e0e6e225" into nougat-mr1-cts-dev am: fb7d3730fa am: b302a1fc14
am: 026d5f5451
Change-Id: I967e7c02d63f54e2f91c4380d6187ef261900ac4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions