diff options
| author | Pete Gillin <peteg@google.com> | 2019-02-15 14:43:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-15 14:43:12 +0000 |
| commit | c690caf0823f5b89ab46798cfa1417ad1af79843 (patch) | |
| tree | 79fc42ae8eeefc19234ed5bbd1b22f7a96b28a79 /annotations/generate_annotated_java_files.py | |
| parent | 284a2b4ace4f3bbf7bcb79e7109b2a4bca6a3cdd (diff) | |
| parent | 3c16439700d7379c96da99188d25e3a9ae1264ed (diff) | |
Merge changes I00d3f12c,Ia4b25dae
* changes:
Revert an unnecessary diff vs upstream in Throwables.java.
Add Android-changed markers to Throwable.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions