diff options
| author | Victor Chang <vichang@google.com> | 2019-08-26 15:41:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 15:41:36 -0700 |
| commit | 59ce30000b0c0cf39f881730043c4231e7334ce1 (patch) | |
| tree | ec989ccfd591e3a7f89a55c7083ef662d3c682bd /annotations/generate_annotated_java_files.py | |
| parent | 41703900ebc0c0a54b5ec39eced51c4626838732 (diff) | |
| parent | ad5f526397c5653cbc267e74af57f4493c8df7e6 (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 skip reason: subject contains skip directive
Change-Id: I2ee1e5bdf50df89c16b19e8e788439858bf505b9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions