OSDN Git Service

Merge "Fix nano vs. millis"
authorJohn Reck <jreck@google.com>
Thu, 30 Jan 2014 23:16:09 +0000 (23:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jan 2014 23:16:10 +0000 (23:16 +0000)
commit3040f7354106dbc2a43b0ca21de25811f0d4057d
tree44a48037dde12eb3b7e148af7e39811975fa8295
parentd95dc28f8ecddc0201144a2aa3f1ebbc018e5892
parenta6260b83da52b80438074a9fd207327d9e6e6d03
Merge "Fix nano vs. millis"