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:
f3d638b
0b58f19
)
Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus...
author
Robert Sesek
<rsesek@google.com>
Thu, 13 Oct 2016 14:13:36 +0000
(14:13 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 13 Oct 2016 14:13:39 +0000
(14:13 +0000)
Trivial merge