commit | 3040f7354106dbc2a43b0ca21de25811f0d4057d | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Thu Jan 30 23:16:09 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 30 23:16:10 2014 +0000 |
tree | 44a48037dde12eb3b7e148af7e39811975fa8295 | |
parent | d95dc28f8ecddc0201144a2aa3f1ebbc018e5892 [diff] | |
parent | a6260b83da52b80438074a9fd207327d9e6e6d03 [diff] |
Merge "Fix nano vs. millis"