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:
41685ce
db3146c
)
resolved conflicts for merge of db3146c0 to klp-modular-dev
author
Jeff Brown
<jeffbrown@google.com>
Fri, 14 Mar 2014 04:07:33 +0000
(21:07 -0700)
committer
Jeff Brown
<jeffbrown@google.com>
Fri, 14 Mar 2014 04:07:33 +0000
(21:07 -0700)
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
Trivial merge