summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2021-01-06 05:02:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-06 05:02:45 +0000
commitd56018852c6f3263a06f65e6abd5b03d54d2603b (patch)
tree3b71cdd89c171d1ceccdfe52b8ce38248997d7fe /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3785d3adf8495add67229aa092fc60ede283e09e (diff)
parentce4f99fd745a856fe98fe8001bccfefb5aef78d3 (diff)
Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b4702 am: ce4f99fd74
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac83990d1dcd99a1024b6eb77fc4a0201b268b7f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions