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:
2b74d2c
0c63d94
)
DO NOT MERGE ServiceManager: Restore basic uid check am: f03ba2c0d8 am: a9963dcfb7...
author
Arve Hjnnevg
<arve@android.com>
Tue, 9 Aug 2016 20:58:24 +0000
(20:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 9 Aug 2016 20:58:24 +0000
(20:58 +0000)
am:
0c63d9490c
-s ours
Change-Id: I2d17ab94a66c5ee9b5aa7d0bd8a89e31f39d7b9d
Trivial merge