diff options
| author | Victor Chang <vichang@google.com> | 2019-08-08 12:00:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 12:00:41 -0700 |
| commit | f381b85137c1e3d752e613d79533d21084744eb8 (patch) | |
| tree | eb464827d582ffe9f6ac32e6212aabdd5a152f4d /annotations/generate_annotated_java_files.py | |
| parent | 3ddb7c5890f8306bccd27d06915d298e125a0978 (diff) | |
| parent | 1dd7cc7ea3a19fe63026dbe79ad5ec5fd65d69f7 (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 skip reason: subject contains skip directive
Change-Id: Ib6f00367357df8c2361a4a3ff217aadaa552c4ac
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions