OSDN Git Service

Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)

Trivial merge