am 79f107bd: Do not merge

Merge commit '79f107bdb2c509abb02cfca92ca9dba6187282bc' into eclair-plus-aosp

* commit '79f107bdb2c509abb02cfca92ca9dba6187282bc':
  Do not merge