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:13:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-04 01:13:01 +0000
commite46b83026ebce2da0b40a4a1b2ebe67beaa9fe2b (patch)
treec1961b6b931dbe1a6c5c4b7665701770eb313b43 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta7592f99b0640cd9c75f153de2b419254dc9689d (diff)
parent54086aadf131ef90fd86ec0cd417ab61e31abe01 (diff)
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours am: 3efa9f7d5f -s ours" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions