[automerger skipped] Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 am: ab3235ad5b am: 5fb8ac2010

Browse Source

am: 97238d791f  -s ours

Change-Id: Icf3a98f193be43b1b82e88c2ec88fe1aa3f33093

...

This commit is contained in:

Atanas Kirilov

2018-06-27 20:25:02 -07:00

committed by android-build-merger

parent fb91800122 97238d791f

commit 4a355a58df

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available