summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2020-06-18 20:59:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 20:59:24 +0000
commit91bcf9529f102097dc6ac7e1d16fd912d9b6f297 (patch)
tree213bebe1bb4ca15a2dc110870792c4fec33acb83 /tools/aapt2/java/JavaClassGenerator.cpp
parentfde816b3e2e795cc2f06b2a1625c7c61e97ffc22 (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: Ia64188ec693e2595eab40bdbf2e3ee2714eb8b04
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions