summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-01-29 20:43:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-29 20:43:59 +0000
commitaa11921d25abd30f7e283b06373f2fe39ecc3404 (patch)
treec434455f64cd2c980a74a148b2fc048cd24928ac /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf5682c033250eeb31a22f1a607c748a0f7707d13 (diff)
parent4a241c28a7e529b043bbfffd885af0d44690bad0 (diff)
[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 skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307475 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I081848d8e1fafcf2f0a29a5359a6cd0fef167cb9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions