OSDN Git Service

Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 8 Jun 2016 16:59:59 +0000 (16:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jun 2016 17:00:00 +0000 (17:00 +0000)
commit3bb436600654e4da253a4b77a86c1dbfa208da8e
treee3ed06d667caae82f0154d8962d68a8cf36f4bf1
parentd05236024edf0ebcc5c55566e6334a49a8a83ebd
parent157b1628fd84dc3ef0355fddd8d281618f94d33e
Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev
services/core/java/com/android/server/pm/ShortcutService.java
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java