Commit 4a789123 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: CTS for [Prevent shortcut info package name spoofing]" into nougat-mr1-cts-dev am: 88eb5511  -s ours" into oreo-cts-dev
parents 1823a1ff b78e96ec
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