tree 41e7e66dd3e360f3fca848326a9cacc31a27720b
parent 3d058ea5a0157f642bd3bbf592c29581feba3179
parent 5fb8ac20107566dea76ce58547d04dc4b6ef9b51
author Atanas Kirilov <akirilov@google.com> 1530150918 -0700
committer android-build-merger <android-build-merger@google.com> 1530150918 -0700

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

Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db