am eec2eaa4: am c4bb5d41: Merge change I3c675fc6 into eclair

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

* commit 'eec2eaa4898829df3793fb2153c0fa9656f6faa2':
  New defaults for Passion