diff options
author | Android Merger <noreply-android-build-merger@google.com> | 2019-08-26 21:03:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-26 21:03:26 +0000 |
commit | b6341d37067a8d88dea91531db62c80dd89bff56 (patch) | |
tree | d6ddd09f75e76afe36dcac8757388a99328f4661 /annotations/generate_annotated_java_files.py | |
parent | 51560a0acd3953f8113c0f2fdc5f30754c34e2f6 (diff) | |
parent | 520c4fceb92fd4129e35ae02ef3425c63acf51be (diff) |
Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1cbd924a11 -s ours am skip reason: subject contains skip directive" into pie-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions