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:
7a47bad
1221ddb
)
am 4db59328: am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app...
author
Dianne Hackborn
<hackbod@google.com>
Tue, 22 Jul 2014 13:53:04 +0000
(13:53 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 22 Jul 2014 13:53:04 +0000
(13:53 +0000)
* commit '
4db593286f561ad5af1c32f9dbd12ebd8ca0d242
':
Add permissions associated with app ops.
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge