OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
247ae46
eb304f0
)
DO NOT MERGE ServiceManager: Restore basic uid check
author
Arve Hjnnevg
<arve@android.com>
Tue, 9 Aug 2016 20:55:23 +0000
(20:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 9 Aug 2016 20:55:23 +0000
(20:55 +0000)
am:
eb304f0a36
-s ours
Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed
Trivial merge