OSDN Git Service

Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 15 Jun 2016 21:44:57 +0000 (21:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jun 2016 21:44:58 +0000 (21:44 +0000)
commit70a91541e9eb2acc6ee5a34785abdc420127a5ec
treeefa94896c8cbeb431d4e5ad930ff2feb1ab16412
parentca460ea1674736f3b4f6d1503e18a72c29de0c46
parent9e1f5595bd7ffe3af6ca35b3235dfca0ecd07978
Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev
core/java/android/content/pm/ShortcutInfo.java
services/core/java/com/android/server/pm/ShortcutPackage.java
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java