OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dd9902 4c9c895)
resolved conflict in mergre to goog/master
authorEd Heyl <ed@google.com>
Thu, 26 Jul 2012 14:45:43 +0000 (07:45 -0700)
committerEd Heyl <ed@google.com>
Thu, 26 Jul 2012 14:45:43 +0000 (07:45 -0700)
Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447


Trivial merge
build
About OSDN
Find Software
Develop Software
Help