OSDN Git Service

Merge "Restore the up time preference."
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 26 Jul 2018 00:50:31 +0000 (00:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 Jul 2018 00:50:31 +0000 (00:50 +0000)

Trivial merge