OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c06d6b
f71edca
)
Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev
author
Jason Monk
<jmonk@google.com>
Wed, 3 Sep 2014 12:59:34 +0000
(12:59 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 3 Sep 2014 12:59:35 +0000
(12:59 +0000)
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge