From: Makoto Onuki <omakoto@google.com>
Date: Wed, 10 Aug 2016 19:25:34 +0000 (+0000)
Subject: Merge "Fix two shortcut manager issues" into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~2599
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c36175ac19a78698a1bf7d7717933c517c4e4f07;p=android-x86%2Fframeworks-base.git

Merge "Fix two shortcut manager issues" into nyc-mr1-dev
am: fc13448507

Change-Id: I07dca777edd3264c7bf8d6e110804d2e7df3cc97
---

c36175ac19a78698a1bf7d7717933c517c4e4f07