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-06-20 06:43:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-20 06:43:58 +0000
commitc976f0ee23fe48e8bcd7691b14fb8c0041a62d52 (patch)
tree8fd0f111aee1c0aba313dd147a768c42e08cf2e9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta2a64922faeea218abed9c9563c7908461ba1a2f (diff)
parent0ec93dfac633e7dfe26ab4b23d43faf2f39d10a6 (diff)
Merge "Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddff0 am: d476c27fb0" into rvc-d1-dev-plus-aosp am: 0ec93dfac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843909 Change-Id: If68a41662605279448a2e4eb90b9f835f64fa380
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions