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:
b49e11f
c9fad76
)
Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2a8 am:...
author
Erik Kline
<ek@google.com>
Tue, 12 Sep 2017 06:34:11 +0000
(06:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Sep 2017 06:34:11 +0000
(06:34 +0000)
am:
c9fad76673
-s ours
Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1
Trivial merge