am f74c8a0e: resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosp

* commit 'f74c8a0e66b6869d3b3bb4a30bf2f089e350980e':
  Fix Double.toString.
tree: 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
  1. src/