OSDN Git Service

Merge "Fix ms to ns conversion unit"
authorMatthew Xie <mattx@google.com>
Fri, 16 May 2014 22:29:58 +0000 (22:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 May 2014 22:29:58 +0000 (22:29 +0000)

Trivial merge