OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e31fb21 cf1f9d2)
am cf1f9d2d: fix bad merge conflict resolution
authorColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)
* commit 'cf1f9d2d67411b91c6bc07a12595753471d86b8b':
  fix bad merge conflict resolution


Trivial merge
build
About OSDN
Find Software
Develop Software
Help