diff options
author | Paul Hu <paulhu@google.com> | 2020-06-29 12:55:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 12:55:53 +0000 |
commit | 24b1d43b6f83b54ce855ef3742803aa81d1df87c (patch) | |
tree | f3102ccfd6a5d5a7cf4aa1490b09e47a093c3f53 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a973eb60e340e9c3bc0d2061456ed518f3e2ea3c (diff) | |
parent | b4226fe3e54c140961984a4f732bd674cd62fb2d (diff) |
Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2 am: 71eee20732 am: 429126464c am: d7638aecc2 am: b4226fe3e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions