tree 2918beb15f79cf337d69d7e243f52bd173f10a71
parent 768421daf5745fb47a9f0ce7fa95a0f28170b210
parent ac2a5cf7e45a2fa7936119517e4f52517b9d5747
author Marco Nelissen <marcone@google.com> 1259966907 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259966907 -0800

am ac2a5cf7: Fix fake timing.

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

* commit 'ac2a5cf7e45a2fa7936119517e4f52517b9d5747':
  Fix fake timing.