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:
39d890d
22d0bdf
)
Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp...
author
Dan Stoza
<stoza@google.com>
Tue, 27 Jan 2015 20:06:33 +0000
(20:06 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 27 Jan 2015 20:06:34 +0000
(20:06 +0000)
Trivial merge