OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47102e1 cfad7ae)
resolved conflicts for merge of cfad7ae9 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:21:34 +0000 (10:21 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:21:34 +0000 (10:21 -0700)
Change-Id: I119e37c6689c4cc49663748a72c17dc55a362b02


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help