summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2020-12-02 01:44:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-02 01:44:50 +0000
commit5f32287f80b24019af600865378533932c773eb4 (patch)
tree7cac14effd53d40c1dd37ebabd6ec9baa0ebef16 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8bee663c0132118c9a82a42fc3ad972fa40df2a4 (diff)
parentf833ff0d2c3bf7801703ed1d6e340857865628d0 (diff)
Merge "Add new carrier config option for enabling SIP PUBLISH of RCS caps" am: 88f8c04dc3 am: f833ff0d2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515260 Change-Id: I05439993580463a8421a2c1f30828d4f99c0b055
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions