tree cf198da9ed8bc8b7e3a544ba8cff31711d980951
parent 2feecf6f379438c2e8ebc4c270ad9e4d62f6c37c
parent 4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8
author David 'Digit' Turner <digit@android.com> 1308586258 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308586258 -0700

am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8':
  emulator: Build emulator platform images as ARMv7-A