diff options
| author | Victor Chang <vichang@google.com> | 2019-08-26 15:17:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 15:17:11 -0700 |
| commit | 4a22e1b271c5932682f48930f8ac021dfbc6ad97 (patch) | |
| tree | aaa7107879765689e32136614e5bd4d39435020c /annotations/generate_annotated_java_files.py | |
| parent | 50fd74002b2913673fbc60843ad398b7f39787c2 (diff) | |
| parent | db05217a3d292665be04e72ec2b45a887f697177 (diff) | |
Merge "Merge "[automerger skipped] DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era am: 76140645b5 -s ours am: 1dd7cc7ea3 -s ours
am: db05217a3d -s ours
am skip reason: subject contains skip directive
Change-Id: I81ec2914a8abf95f24576299cafe81e498c1d8d3
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions