diff options
author | Victor Chang <vichang@google.com> | 2019-06-21 08:37:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-21 08:37:10 -0700 |
commit | 426661e9f6ac892a29b9062edae4f6202f388c3f (patch) | |
tree | 1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py | |
parent | 8f6f827b458c15ebff80f490e05fd286a0ea1047 (diff) | |
parent | 62740f8728fc04d881dda2957fdb050c9f18af89 (diff) |
[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 714c3b39e5 -s ours am: 78a6f55a1a -s ours
am: 62740f8728 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic240beef0347717ae5c1521f9c64d3494a6aad06
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions