OSDN Git Service

Merge "Fix updateShortcuts() with icons" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 29 Jun 2016 23:55:01 +0000 (23:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jun 2016 23:55:03 +0000 (23:55 +0000)
commitbc8e0052fdf92efd0471b97092ee6a7e1eb2320d
tree026d639c08fc0fe7ec4b27734b53336af8867d02
parent9f22e79625bb914fe59eadce4cf3d927dfe6bfbc
parentdd097812fa84b898a46cb5dd253422e78779a150
Merge "Fix updateShortcuts() with icons" into nyc-mr1-dev
services/core/java/com/android/server/pm/ShortcutService.java
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java