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:
58c4917
7bbe370
)
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
author
Christopher Tate
<ctate@google.com>
Fri, 17 Jun 2016 21:35:16 +0000
(21:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 17 Jun 2016 21:35:16 +0000
(21:35 +0000)
am:
7bbe370365
Change-Id: I12a40bfdbb01fdde2c4a4613c339b7b001aef6c4
Trivial merge