diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:45:04 +0000 |
| commit | 3ed1e9e26d677080ab6aabc6d984b4bfa574f8fb (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2994515320d1c45f122a85ba47a7a7eb38c4d4a5 (diff) | |
| parent | 8912e0a06ce2a06ae7de386d246c63e484eb9d45 (diff) | |
Merge changes from topic "am-af2b25a14d58476cb3e07986eaf5ab88"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours am: 4e7a7d3cd3 am: ae97066bb9 -s ours
[automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: f4eefc55c4 am: 4cccd0c4e3 -s ours am: 67bd3caef0 am: 3ce491fe0c -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions