tree 43960bd2f99d909fd4b9fada51e3a3b491c0a571
parent 4982e345cf34a19a3bca45b4787aca6e3fc93f58
parent 8dcbb90dea22a876d9cc517f382bb82c98d87450
author Christopher Ferris <cferris@google.com> 1363304606 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363304606 +0000

am 8dcbb90d: am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."

* commit '8dcbb90dea22a876d9cc517f382bb82c98d87450':
  Remove unused arm defines.