diff options
| author | Paul Hu <paulhu@google.com> | 2021-03-10 04:32:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 04:32:26 +0000 |
| commit | 22e1b06884a6f901cd41fa42fc39632b1be8f60f (patch) | |
| tree | 238af666eee66ae5d11485bc63826c793ae6dae3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a5d4be1bddec38d95400cd8e4fccad849f96a8c1 (diff) | |
| parent | 601630120d61e955f47925d4441f0c7ebeb3b60a (diff) | |
Merge "Replace PendingIntent#getIntent" am: dd010bff79 am: 601630120d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f4cb9ff8e42373e7ebf71b3d4559b768ebfdbe7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions