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