diff options
author | Lucas Dupin <dupin@google.com> | 2020-06-18 21:04:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 21:04:47 +0000 |
commit | 82f031899fd1d023e20002af45eb4f7fdd74dfa0 (patch) | |
tree | 213bebe1bb4ca15a2dc110870792c4fec33acb83 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b2c1b3c359c2d739186f7d39795e7c67a35b5731 (diff) | |
parent | 84f8d7602f3bb6580586def6c0cf1465eab5c4d4 (diff) |
Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 84f8d7602f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767
Change-Id: I15fded68a418b36bb9d520821792858e3f5685d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions