diff options
| author | Victor Chang <vichang@google.com> | 2019-08-08 12:26:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 12:26:38 -0700 |
| commit | 4bfff52f8b8073a5b796c26c3f7ebab4787dcada (patch) | |
| tree | 1583003a891813bf5a9c0e7e74011b439f106070 /annotations/generate_annotated_java_files.py | |
| parent | b57c006c9fc4285a0a217ce443049fd4d610f6f4 (diff) | |
| parent | 9ffcfd442816ea3d3e4ecf9d5ccc362c7c528b74 (diff) | |
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: f381b85137 -s ours
am: 9ffcfd4428 -s ours
am skip reason: subject contains skip directive
Change-Id: I2eb3b27235671ede9889a2f6b87045a78470b717
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions