summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRob Carr <racarr@google.com>2021-01-26 20:45:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-26 20:45:16 +0000
commit91b0140ccaf5375d0a3d9eac9e34d731a6695544 (patch)
tree91d9c71c40721305ab49efe0bba0517af5b33fba /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb132ec6a23d5eab1de7575e8c8c94067409ce4ca (diff)
parent8935ee5f8fcae402afab13fdbdc8aa23779ca6f1 (diff)
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0 am: 8935ee5f8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If7eceeefd8a4eb8541b7b61e3db7bec1593576c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions