tree 31c1bcafb2abc8f22c9ea93b7f23ae7233fddb7f
parent ad7ab8be4774a4fbb01a50deed52e819549327a7
parent f27eb3264d4b5d3fd154834a709a9a53cc878b58
author Ray Chen <raychen@google.com> 1259760343 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259760343 -0800

am f27eb326: Merge change I0b6ee9fc into eclair

Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.