summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-24 21:25:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-24 21:25:32 +0000
commita7940c332c8809d00c4831ed2f0f5917a2481498 (patch)
tree90c9fab68609177d1e954eca5daf5c30fe4e7612 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc048341e5a19714918d6a8713caca8c9df5e0739 (diff)
parent7d6a158b8e39f5a3e6cacb5ad5f43b7a5bc8015e (diff)
Merge "Skip bg PSS collection for apps using a camera am: fc76b97d1b am: 9e4c36f7e1" into rvc-d1-dev-plus-aosp am: 7d6a158b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12227201 Change-Id: I20b319a7d01fd68ba2f4a1213874fd4c37aed2bb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions