From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Thu, 26 Jul 2018 00:50:31 +0000 (+0000)
Subject: Merge "Restore the up time preference."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d3773880d1c6029bf20f95cb2d4f66d3a4dd9a6;p=android-x86%2Fpackages-apps-Settings.git

Merge "Restore the up time preference."
---

9d3773880d1c6029bf20f95cb2d4f66d3a4dd9a6