OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bfa73e f8a3059)
am f8a30598: resolved conflict in mergre to goog/master
authorEd Heyl <ed@google.com>
Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)
* commit 'f8a30598925855cb387511d32a5b3388ebc908c8':


Trivial merge
build
About OSDN
Find Software
Develop Software
Help