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:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-02-04 01:13:39 +0000
commit19ef085a293da6a8930b697ef4ae15a9f69c5957 (patch)
treec1961b6b931dbe1a6c5c4b7665701770eb313b43 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9ec1bb63e392138832e09562b15ed1f2ebbca0de (diff)
parentb7a972abf0fd29d962d3265d5c168f230e363ad1 (diff)
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 9a3c3898f9 -s ours" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions