diff options
| author | Brad Ebinger <breadley@google.com> | 2021-03-01 08:16:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:16:14 +0000 |
| commit | d9caa80044e79536a69eaecc5bca8acc9c908ad5 (patch) | |
| tree | 69703a82376a2c7bbebf23425d7ea7fe3c2a2b8a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 73dddeb4ac82a21e8e85c3250afecc92f889c0c9 (diff) | |
| parent | d2fbe50daa25154fc8de84c244e25223bded90e1 (diff) | |
[automerger skipped] Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332 am: f92683b7d1 am: d2fbe50daa -s ours
am skip reason: Change-Id I863f2e6e1afffce5e8ea103790cf368c59734029 with SHA-1 215c5e9115 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5af4e27bd7cb2f35bf51eb9c968570fb5054bda5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions