summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2020-06-18 20:59:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 20:59:32 +0000
commit73cf407d0550c0e3a80ebb617a7ca7b604940f01 (patch)
tree51f8fa21c1c3022b29ad496d53bd3014670ffeee /tools/aapt2/java/JavaClassGenerator.cpp
parent11059a36cfd774602781a7cd6dd15373fa577eb3 (diff)
parent8d4b42a0696274d6b017bbfc35c8c9e2eac88113 (diff)
Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767 Change-Id: I85855947987e4cc06994b0143b8b1828ea265e8b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions