summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2020-08-29 03:06:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-29 03:06:32 +0000
commit3df95b2207de2a16953f1b91efa7f4ed6b9083fa (patch)
treeabeec9031eff02a101f3d65707648509cd311ce0 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf2ed8e00a70d0aff5d27a0f3c84513a0162b076e (diff)
parentb64251436d5f4d2d4c11d78b70d78f7df48710b6 (diff)
[automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b06 -s ours am: 1d9d0f28e2 -s ours am: 03d8fff6fe -s ours am: 2535813dd5 -s ours am: 2c5a82c576 -s ours am: b64251436d -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 6dbda27f98 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12253519 Change-Id: Ie98e5380d94aba46281f8f6b1e3c58f74723535b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions