diff options
| author | Wu Ahan <ahanwu@google.com> | 2021-12-09 02:30:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-09 02:30:09 +0000 |
| commit | e14cbc8d3b3f0c90c8607da0acd0b36c8a28221f (patch) | |
| tree | b1036df583b0c69dad64523462ed04fe9a02e7fc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fe082e24193599b78f16b554ca1a151bf64782d4 (diff) | |
| parent | 6a6a36aa0dd4db569262dcd5a652f96752f45cd9 (diff) | |
[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours am: 6a6a36aa0d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379915
Change-Id: I5826395674470b827ae4af51bbff58294660f0b9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions