OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d3daa7 19b669b)
resolve merge conflicts of 19b669b to nyc-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Wed, 11 May 2016 23:22:03 +0000 (16:22 -0700)
committerDimitry Ivanov <dimitry@google.com>
Wed, 11 May 2016 23:22:03 +0000 (16:22 -0700)
Change-Id: If66754e3a9992ceb5f51173c794c7658ec5ee775


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help