OSDN Git Service

Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 25 Apr 2017 12:02:02 +0000 (12:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 25 Apr 2017 12:02:07 +0000 (12:02 +0000)

Trivial merge