summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2021-02-26 21:17:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-26 21:17:19 +0000
commitd2fbe50daa25154fc8de84c244e25223bded90e1 (patch)
tree36b8a10915e2f42e41ef987a0c309851b781f1d2 /tools/aapt2/java/JavaClassGenerator.cpp
parent0ab80262dfa8aff7e6758b2f94d7a62a22f93d30 (diff)
parentf92683b7d10916ef7c699a23a712ef51fcc87d3b (diff)
Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332 am: f92683b7d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib2c57f359f140a22e6d1bc84cc9b05ae47ba52ae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions