tree 826b39b9fb3f47565470b0824c50d2d0b741179f
parent 1a4ce8dc30e8f87c982c604973664bb81adabd48
parent 779c0a9a7a9d21b031167c21ca32004c23af6de4
author Ben Cheng <bccheng@google.com> 1256229072 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256229072 -0700

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

Merge commit '779c0a9a7a9d21b031167c21ca32004c23af6de4'

* commit '779c0a9a7a9d21b031167c21ca32004c23af6de4':
  Add stack unwinding directives to atomic-android-arm.S.