OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b767f63 7f4618c)
resolved conflicts for merge of 7f4618cb to lmp-mr1-dev-plus-aosp
authorChristopher Ferris <cferris@google.com>
Fri, 10 Oct 2014 17:05:38 +0000 (10:05 -0700)
committerChristopher Ferris <cferris@google.com>
Fri, 10 Oct 2014 17:05:38 +0000 (10:05 -0700)
Change-Id: I9b65f8287a4f155f26ae7e217e9553a3aaf22240


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help