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-06 17:11:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 17:11:05 +0000
commit96617a3edc119a8470e84a4a47317a6cba3679d9 (patch)
treecade9d6f17d984a1d175b8c1e74e2a13f8aa2df7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5537c1e923236ecb1f5db7d37f7a17a57492b71b (diff)
parent41fd845d6ecaa36d7c0662a7ca07a70af8e8e778 (diff)
Merge "Merge "Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc" into rvc-d1-dev-plus-aosp am: bfc7c35e88" into rvc-qpr-dev-plus-aosp am: 41fd845d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935 Change-Id: Ic466543dcc2f96872318c37069a4eb6f22c1020f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions