OSDN Git Service

Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 3 Apr 2017 22:13:34 +0000 (22:13 +0000)
commit6a7a967b712145a84771de2920082d3647de2d24
tree1c3c996fbee5a0691ca3c5c0fe1877a2ea42818a
parent9077faab1fa6d8ecfc6da8e283388d7a3468ddfa
parentc4361e34ad6fbc1bab34271ece668ebf79232a64
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
services/core/java/com/android/server/pm/ShortcutService.java
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java