tree 7396c54a0536c88326b6644b1e1750e504a8777c
parent a39751754d6271b863199da3ac693990331c8c4e
parent 3ebc52eb710c75a1ef51dca7c767701bab74a9ee
author David 'Digit' Turner <digit@google.com> 1252545060 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252545060 -0700

am 3ebc52eb: am 2f21659d: Merge change 24213 into eclair

Merge commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee'

* commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee':
  Fix a bug that prevented the "generic" product builds from working in the emulator.