am f59a2ae6: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair

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

* commit 'f59a2ae61e985a54f897c5f95977dc0d08e8dbe6':
  DO NOT MERGE  Reverting change I53e91db7.
tree: 32efc48f558810b9174d819858017eb13f8b5dff
  1. core/
  2. services/