OSDN Git Service

Merge "ShortcutManager: finishing touches" into nyc-dev
authorMakoto Onuki <omakoto@google.com>
Tue, 3 May 2016 16:27:44 +0000 (16:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 May 2016 16:27:46 +0000 (16:27 +0000)
commit7d164d35a41d2aa351f0a27faf05fc67ba262c07
tree1a1b19b7c252c41603cdf48d4d47a05700694f96
parentcbcefaf85c20cbbb2723544461ddcd221e06b0a7
parent4d36b3a8c5ba1289d851ef337e46709bba333100
Merge "ShortcutManager: finishing touches" into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java