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