am 1154bcb3: (-s ours) am d518a6d3: Merge "Fix the 16 bit/32 bit instruction check for arm."

* commit '1154bcb3c095606fcaa5e836e935cb3406f6703d':
This commit is contained in:
Christopher Ferris 2015-08-27 05:06:25 +00:00 committed by Android Git Automerger
commit ed90d4caea

Diff Content Not Available