tree a27774933a298ff7de0fcb89d544657b51c208c9
parent c6dbcc137ea49c1fe0f47aa9a46de5c8f9e3bb8c
parent aad860012e5e02f1eeb03fbda6094c30947e2169
author Atanas Kirilov <akirilov@google.com> 1530142181 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1530142181 +0000

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing