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

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