diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-03-17 22:13:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 22:13:33 +0000 |
| commit | dd5bb95b98cee1975bb7b6ca754fc6fcdc98c618 (patch) | |
| tree | 3183e6e8c46c8005a0f6d62b9b8ef199dfea4ced /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d28b0419e7b12553cfc7d6704d375c2e92832cc5 (diff) | |
| parent | 33f340b54a37a84347fb65f7b28c40ab593f3ea5 (diff) | |
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 0aa487570c am: 825bc7bb90 am: 33f340b54a -s ours
am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 2b9d0b200a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900
Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions