tree e6a20593242f1a8da2c23862cd443645b48dacbe
parent 8658fa51d15290cf43178d0633b53f11ff08a4aa
parent 89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a
author Brian Muramatsu <btmura@google.com> 1315505738 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1315505738 -0700

am 89ba0f7e: am 1615c2fc: Rename generic_arm5 to generic_armv5

* commit '89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a':
  Rename generic_arm5 to generic_armv5