am a01dc0fc: am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair

Merge commit 'a01dc0fc59fb7a7c4fd33533ec47069268b70863' into eclair-mr2-plus-aosp

* commit 'a01dc0fc59fb7a7c4fd33533ec47069268b70863':
  do not merge