diff options
| author | Victor Chang <vichang@google.com> | 2019-08-26 16:38:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 16:38:36 -0700 |
| commit | 14d6922ffe6dcb63368f9f38c55bd44e5182227d (patch) | |
| tree | 1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py | |
| parent | 5a323ab7dfed8782563dd775d63f258f8437807f (diff) | |
| parent | 59ce30000b0c0cf39f881730043c4231e7334ce1 (diff) | |
Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39e5 -s ours am: ad5f526397 -s ours
am: 59ce30000b -s ours
am skip reason: subject contains skip directive
Change-Id: I004a9d2c26261247265a4758f1811969b5f825ec
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions