am 2276398d: Merge change I0d9344aa into eclair

Merge commit '2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-plus-aosp

* commit '2276398db0b0208b7627dc436ecc9e6c09e68107':
  Fixed