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