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:
76415ee
17b1c2c
)
Merge "resolve merge conflicts of 7d1428d7f3 to master."
author
Qiwen Zhao
<zhao@google.com>
Thu, 19 Nov 2015 02:51:40 +0000
(
02:51
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 19 Nov 2015 02:51:40 +0000
(
02:51
+0000)
Trivial merge