tree 259784eabb51ae682c5f89491978eca29fd38448
parent 96b6bf3e923e23d695c1322fc41a57c9346b3e90
parent 8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d
author Ben Cheng <bccheng@google.com> 1255453129 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255453129 -0700

am 8a0a5274: Add stack unwinding directives to atomic-android-arm.S.

Merge commit '8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d' into eclair-mr2-plus-aosp

* commit '8a0a5274ff37cbf3acad0199735a05e5fe3b5c9d':
  Add stack unwinding directives to atomic-android-arm.S.