tree cdf4ecd7add1f5e9b93cde3b2934e30c332b3d87
parent 20b5c6c9d6fdd0b4192d467086a097a28d7b3a0a
parent bf2739d3b58ee5b2f190007499f1fbfd0b3441ce
author Elliott Hughes <enh@google.com> 1337636473 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337636473 -0700

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