tree 94dbdadaca6ba34afc9f9d96b3304989b1181eda
parent 1cc68d7b703c8663bc7cc0457a5fd5786c2514a6
parent 1e1732399a48c9521eea7a117f1f0e87ca64d2ab
author Makoto Onuki <omakoto@google.com> 1470857128 +0000
committer android-build-merger <android-build-merger@google.com> 1470857128 +0000

Fix two shortcut manager issues
am: 1e1732399a

Change-Id: Ie4ea05bbfd65c3bb2bcbefab234fa5c56443dba4