OSDN Git Service

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc13...
authorAtanas Kirilov <akirilov@google.com>
Thu, 28 Jun 2018 01:55:18 +0000 (18:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jun 2018 01:55:18 +0000 (18:55 -0700)
am: 5fb8ac2010

Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db


Trivial merge