summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2020-08-29 02:31:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-29 02:31:19 +0000
commit2c5a82c57682ad2f8223b9b625bd7a9607d46b19 (patch)
tree0bb4ac69f8916b355e02ee8bbd11cb0ea6f5e7b0 /tools/aapt2/java/JavaClassGenerator.cpp
parent0182936188c301b4ad8e49ebb2ea9a9d8b7fd0e9 (diff)
parent2535813dd56546a06dd984bb349d070ec051b24f (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 skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12253519 Change-Id: I8ebe8f7d6fe52a98dfb265c48e60c117ed812974
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions