tree 1d787395ab10ba4697b48e629cca17e3b1a7e198
parent 5c204f59f7b7a1038bed1ac7764f77e6a2172cf0
parent 491489bbb89c62df4442afda173e0f953ba84dcb
author Ben Cheng <bccheng@google.com> 1256228780 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256228780 -0700

am 491489bb: am 21ec779a: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '491489bbb89c62df4442afda173e0f953ba84dcb' into eclair-mr2-plus-aosp

* commit '491489bbb89c62df4442afda173e0f953ba84dcb':
  Add stack unwinding directives to atomic-android-arm.S.