diff options
| author | Brad Ebinger <breadley@google.com> | 2021-03-05 05:18:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:18:55 +0000 |
| commit | 58f3d320c60d15c03dd674f498ab3f1626c14042 (patch) | |
| tree | ee6ffa8ae6d1395dc575589bd4e2c254bd7a8673 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 111fcb650d60248371c15663a71e1b5670d27d02 (diff) | |
| parent | 77e564bfba4d55f4600cc5947e0246676ddb3152 (diff) | |
[automerger skipped] Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf am: a0f85ebf75 am: 77e564bfba -s ours
am skip reason: Change-Id I6d4ae879d9d2b347f6576ea20f9e42454b39936b with SHA-1 f7607fbcad is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff896b8dc078c6d1ce91ea7ff9943cc2b40441de
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions