OSDN Git Service

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)
commit2ea6527e7bc80620bf4038aabf89dface71976d3
tree08be009cdf5cd355760bae28a3631372c791cd40
parent02800879e7e26fc271806e1228140dc70ab509c3
parent5a98ec046c555b02d2f306efc117f7dafd32fc7d
am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp

Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'

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