diff options
author | Rob Carr <racarr@google.com> | 2021-01-26 20:05:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:05:45 +0000 |
commit | d3eb04e729c0a1db02cc00085b4f0f78768b8bc8 (patch) | |
tree | 076205352db5cd67f8a0c157472ded175fa05938 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 74f95bbb51d197943f16d55a3d681454bba445b5 (diff) | |
parent | a22cfe0b4627816963873da3d6849c8d43f363dc (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1cb556ca775bbfbe4346eab371a1cc5b77acac31
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions