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:
fb4a57b
2a001e8
)
resolve merge conflicts of 0783d5f to stage-aosp-master
author
Dan Willemsen
<dwillemsen@google.com>
Fri, 5 Aug 2016 22:57:47 +0000
(22:57 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 5 Aug 2016 22:57:47 +0000
(22:57 +0000)
am:
2a001e8bfe
Change-Id: Ib0fc16f4a35761c0b2a3e3273800e1f27e527577
Trivial merge