tree fb24d7e96a44591eb53a2263d4608711c47e5136
parent b54ff8cd28e12d700bff91f2b1ae13078fb1ad50
parent f001f5f52082d19b9bb19e6e6ec3d7e08bf12dcf
author Jean-Baptiste Queru <jbq@google.com> 1344618238 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344618238 -0700

am f001f5f5: Merge "Fix build - Add TARGET_ARCH := arm"

* commit 'f001f5f52082d19b9bb19e6e6ec3d7e08bf12dcf':
  Fix build - Add TARGET_ARCH := arm