diff options
author | Rob Carr <racarr@google.com> | 2021-01-26 20:45:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:45:51 +0000 |
commit | d1874fe87089a000bdd8edf23d095da9c51e3c7b (patch) | |
tree | 91d9c71c40721305ab49efe0bba0517af5b33fba /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 91b0140ccaf5375d0a3d9eac9e34d731a6695544 (diff) | |
parent | 2092b189c69c8cc41d0e411eb9fb548ce8927ecf (diff) |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014 am: 2092b189c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2bcdaa459c5d6b3e75312ac9f8183208f0ace9d2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions