diff options
| author | Rob Carr <racarr@google.com> | 2021-01-26 20:06:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:06:23 +0000 |
| commit | 03ca6d9014dc9d34a3c9e329d2e2b7d69f8ae004 (patch) | |
| tree | d65266fe5060418a0cc85681933b684716b7c3a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b8e01656c094f21956f829a9e9e731300db4df97 (diff) | |
| parent | d3eb04e729c0a1db02cc00085b4f0f78768b8bc8 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bbdf308d354d716f4e4e8349cd4eed3cff4cb9a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions