tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent 7069e9bc5ec27f5cd74cf198560d8d71480e0646
parent a77f7fdd912c0fd3145fe9087a12c4c8325f6d9c
author repo sync <enh@google.com> 1294887629 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294887629 -0800

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

* commit 'f74c8a0e66b6869d3b3bb4a30bf2f089e350980e':
  Fix Double.toString.