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:
9fcdb93
9872412
)
am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
author
Fyodor Kupolov
<fkupolov@google.com>
Wed, 15 Jul 2015 00:59:47 +0000
(
00:59
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 15 Jul 2015 00:59:47 +0000
(
00:59
+0000)
* commit '
987241265b77542f45ce95838c25beeaf3ae6849
':
Added sendBroadcastMultiplePermissions method
1
2
cmds/am/src/com/android/commands/am/Am.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmds/am/src/com/android/commands/am/Am.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge