OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ca9b15 cf02165)
resolve merge conflicts of 823e32e to stage-aosp-master am: 1750ab4e21
authorChristopher Ferris <cferris@google.com>
Thu, 21 Jul 2016 02:14:06 +0000 (02:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 02:14:06 +0000 (02:14 +0000)
am: cf02165ee3

Change-Id: I3c9ff3f8992d3a8d36e6c45e3526107796b95cec


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help