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-05-26 22:08:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-26 22:08:46 +0000
commitf3c17447ee938cf0cac78586c977312e575147cc (patch)
treedc79380557b02dfdf84b2bc6c5afef34df27f58b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8a2d613cf7d6acd9f5df6f1c32401b0247ca3a9e (diff)
parent7d5aef5cd48e5184fddf0bd8c7d7472fa4942ae7 (diff)
Merge changes from topic "am-e99a868b312a4aeba1d4329aca420e5b" into rvc-qpr-dev-plus-aosp
* changes: Merge "RESTRICT AUTOMERGE Ensure that DozeFactory uses Main Thread Handler." into rvc-dev am: beb13f0f26 am: 45a1de4981 am: 0d62fc8579 RESTRICT AUTOMERGE Ensure that DozeFactory uses Main Thread Handler. am: 10d4b8de11 am: e6985e26b8 am: 5ce346ac55
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions