summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorCalvin Pan <calvinpan@google.com>2021-02-05 02:51:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 02:51:35 +0000
commitca389a64274496c4f3a77d99b845af320fbb42d5 (patch)
treebce5e2ac8520c6bd145e3a35e561b4b894aa5379 /tools/aapt2/java/JavaClassGenerator.cpp
parentcfc401ac808756f6fbb8961f620822aa7d7ca40b (diff)
parent6362783d8c149b2f60806791d5b30ff5648e549e (diff)
Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce am: 6362783d8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0054d3821355ceda57d4df85af704c8bf7433f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions