tree 2578d04ea75668af4feb8db31c228d7a74b1e7b0
parent ec7dee12cbd701bb73d46ae230da94a0aa36d726
parent 37d5cb3181b4fc94b5e180f1a011330b893fcd84
author Makoto Onuki <omakoto@google.com> 1463509219 +0000
committer android-build-merger <android-build-merger@google.com> 1463509219 +0000

Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808