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.