summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-02 00:32:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-02 00:32:26 +0000
commitf4dcdc7682a097fc1872f837330da077f93e7370 (patch)
tree08a765f21167e0e9cf11fa100179fbf2366a3f3b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8f68d76be3437652966556853cfde9c7696816fb (diff)
parentf12c3b14573e236ef3ed4111cc3e83207ff88fd6 (diff)
Merge "Merge "Revert "Revert "Enable IMS and its config context to obtain UI component""" into rvc-dev am: 8deb612a14 am: e201638cdb" into rvc-d1-dev-plus-aosp am: b69483ec68 am: f12c3b1457
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004931 Change-Id: I35fe86554199c4babc3358a8325d96e729d597fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions