tree 1fdea631d5d584f1658a7b3eb17199824f76c9ea
parent 00bf4c5b5c824aa0f26a8b3548fdf6e018bd06be
parent c6dbcc137ea49c1fe0f47aa9a46de5c8f9e3bb8c
author Atanas Kirilov <akirilov@google.com> 1530145510 -0700
committer android-build-merger <android-build-merger@google.com> 1530145510 -0700

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

Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a