OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3290b10 fda7e8a)
resolve merge conflicts of fda7e8a to nyc-mr1-dev-plus-aosp
authorVince Harron <vharron@google.com>
Thu, 28 Apr 2016 20:26:29 +0000 (13:26 -0700)
committerVince Harron <vharron@google.com>
Thu, 28 Apr 2016 20:26:29 +0000 (13:26 -0700)
Change-Id: I0a3e1411e775af2d8e6aede5b749a386f4b3862f


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help