diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:45:47 +0000 |
| commit | 27b13a2ef027c82292605a56aec9d994421303bb (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1a0f5accc651ce0302b88a8d496cf45733de7e90 (diff) | |
| parent | 19a507d781330462727a384bc339e3c19496ba83 (diff) | |
Merge changes from topic "am-990e4dfbb9e245af98125aa5aa908315"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours am: 4e7a7d3cd3 am: a26090c1ae am: 7a45c44833 am: 158d28a8d0 -s ours
[automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: f4eefc55c4 am: 4cccd0c4e3 -s ours am: 67bd3caef0 am: 2170554e98 am: 6fcec5e819 am: 7bf79464a5 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions