diff options
author | Android Merger <noreply-android-build-merger@google.com> | 2019-08-08 18:38:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-08 18:38:58 +0000 |
commit | 1dd7cc7ea3a19fe63026dbe79ad5ec5fd65d69f7 (patch) | |
tree | 340a4d03e5d88e29aa8577908ad63d5df3116e90 /annotations/generate_annotated_java_files.py | |
parent | 6934436353f6c098e5622e12ef3d2973aa5618e9 (diff) | |
parent | 1cbd924a11b6e3877072b6d1ab291f0a41fd9a26 (diff) |
Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions