am 474429d0: Do not merge

Merge commit '474429d099342fb0ad4959d59e05b764b96c2bb0' into eclair-plus-aosp

* commit '474429d099342fb0ad4959d59e05b764b96c2bb0':
  Do not merge