tree cb1ba1b3c3b0783c38e8be636610855eef6eeb95
parent e42cc8ec43b4ec70617c6d7c8fee9859d8386b30
parent deafc8f6558e3ceae5963528f240a9f1545a6f32
author Elliott Hughes <enh@google.com> 1337636559 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337636559 -0700

am deafc8f6: Merge "Improve ARM assembler assertions." into ics-mr1-plus-art

* commit 'deafc8f6558e3ceae5963528f240a9f1545a6f32':
  Improve ARM assembler assertions.