tree 5b8ee33f9b638648a6180916efcaa6f505348d41
parent c8fe6860ed71c85d6aa8964c447536e3d3ec1625
parent 88a4a1cc18291c4233beb36cf71bc4c7c3f2066e
author Andy McFadden <fadden@android.com> 1368809301 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368809301 +0000

Merge "Adjust timestamp scale" into jb-mr2-dev