OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0280087 5a98ec0)
am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 21 Oct 2010 16:53:57 +0000 (09:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Oct 2010 16:53:57 +0000 (09:53 -0700)
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'

* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
  Explicitly declare assembly only __ASSEMBLY__ macro for assembly source


Trivial merge
build
About OSDN
Find Software
Develop Software
Help