tree 67347350ae93d2c216e291bf07fd4361de1ceef2
parent d63cfc926150d6ea9aad985cf468616489873f10
parent ab3235ad5b596a7b4081ed530421c79730309349
author Atanas Kirilov <akirilov@google.com> 1530149746 -0700
committer android-build-merger <android-build-merger@google.com> 1530149746 -0700

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

Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3