diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-05 10:51:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 10:51:19 +0000 |
| commit | 622f18efdccf215639bd42bbc87b188c9fc2b5d0 (patch) | |
| tree | de4226a854b7d87183aa2ddadb492319fca92c5a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0b1fd703793bf531a51c791feb9f64da8f699781 (diff) | |
| parent | f549173d9c2f71cfecac9ae62a16fb0d74a29436 (diff) | |
[automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: 83fc6687df am: f549173d9c -s ours
am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 24403f7ef2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions