Commit b78e96ec authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE: CTS for [Prevent shortcut info... 

[automerger skipped] Merge "RESTRICT AUTOMERGE: CTS for [Prevent shortcut info package name spoofing]" into nougat-mr1-cts-dev
am: 88eb5511  -s ours

Change-Id: I68104a47c69d4830f87ad11e19832cb79e0aa94b
parents 1823a1ff 88eb5511
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