diff options
author | Rob Carr <racarr@google.com> | 2021-01-26 19:53:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 19:53:14 +0000 |
commit | e058131d5396f50abbf4d7e74f5c5ad2bd39d68e (patch) | |
tree | d65266fe5060418a0cc85681933b684716b7c3a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f0e5190e0b222335881ddc497522660d5652e7b1 (diff) | |
parent | 735a40b06bb5370954e94e39bad6031d34e363e7 (diff) |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I232a503efc439c40a01e4ae9c319bf4a44603489
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions