Merge change Ic2a16d4f into eclair

* changes:
  b/2148252 Fix emulator
tree: 443544391f8d02ce9d3947a2fe9a193c84c38dc9
  1. framework/