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:
4ce53a0
6160f1d
)
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am: 9f82b6bab5...
author
Tobias Thierer
<tobiast@google.com>
Fri, 26 Jan 2018 14:34:03 +0000
(14:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 26 Jan 2018 14:34:03 +0000
(14:34 +0000)
am:
6160f1dbe1
-s ours
Change-Id: Iad86f663488ef80626c216b07bc6e9f71ae2345f
Trivial merge