Commit 4f2ec130 authored by fangshiwei's avatar fangshiwei Committed by android-build-merger
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE: Support prebuilt non-system... 

[automerger skipped] Merge "RESTRICT AUTOMERGE: Support prebuilt non-system IMEs in setPermittedInputMethods test" into nougat-mr1-cts-dev
am: 8620594a -s ours
am skip reason: subject contains skip directive

Change-Id: Ied158577f3e957b87f081abafffa354a18851ece
parents fbbd41ce 8620594a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment