tree 984add0dbf05af2271d16325b699a8c0ac2c23d5
parent e0f893ebb036ded7acc87523bb68f5dd4d1b4a75
parent c3e741e530072743e667adfd18a7c93bec711704
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 nyc-mr2-dev

* changes:
  [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