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>2021-02-04 01:12:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-04 01:12:36 +0000
commite514636ebb7c9edc4532e0e05680dfd62038cca8 (patch)
tree71633f1a19a1b53ffd241d405b948e1e0f99971f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent281fa6e0e2391b63629bba0a90b442047ce6869e (diff)
parent28447be3a7bae518d5cf54527cd8c7e1b200c94f (diff)
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: aa11921d25 -s ours" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions