diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 04:28:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-06 04:28:29 +0000 |
| commit | 5625f26cdc368d0deea716a065cd55352eddd740 (patch) | |
| tree | bd16d59e2ccbdcfa92654ffe29eed1fa9786e57f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 83a86a1830c1626eda45b6f60a82b378d2925411 (diff) | |
| parent | 0a832ef9c35e281bd7dd2925336206c03f3cc4a0 (diff) | |
Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master
* changes:
Merge "Add CAPABILITY_TYPE_CALL_COMPOSER in MmTelFeature" am: bfd05221a3
Merge "Add Call Composer Carrier Config keys" am: 4260bc4f95
Merge "Add call composer Extras for enriched calling" am: a4524a936a
Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702
Merge "Add Call Composer API extras in TelecomManager" am: 6e419a49a7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions