| commit | 2ea6527e7bc80620bf4038aabf89dface71976d3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 21 09:53:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 09:53:57 2010 -0700 |
| tree | 08be009cdf5cd355760bae28a3631372c791cd40 | |
| parent | 02800879e7e26fc271806e1228140dc70ab509c3 [diff] | |
| parent | 5a98ec046c555b02d2f306efc117f7dafd32fc7d [diff] |
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