diff options
| author | Victor Chang <vichang@google.com> | 2019-08-08 12:11:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 12:11:38 -0700 |
| commit | 9ffcfd442816ea3d3e4ecf9d5ccc362c7c528b74 (patch) | |
| tree | ec989ccfd591e3a7f89a55c7083ef662d3c682bd /annotations/generate_annotated_java_files.py | |
| parent | 77c5f9bc10c696820903d6fb8b226bd0297cef1e (diff) | |
| parent | f381b85137c1e3d752e613d79533d21084744eb8 (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 skip reason: subject contains skip directive
Change-Id: I383329d7804e9feb81d6f4f50404467e9d631a8c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions