am 9cb6feee: Merge change Ia20b55c7 into eclair

Merge commit '9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e' into eclair-mr2

* commit '9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e':
  Add hardware support to AVD creation dialog.