OSDN Git Service

Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 24 May 2016 02:24:49 +0000 (02:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 May 2016 02:24:50 +0000 (02:24 +0000)
commita09c9e0fc48816096349aac8960a3b49101d90a3
tree179a2d5a5a002c7e0e86f73eb666298cc6132d2e
parent74ebf3ec67ddbbf7752da120a57c4624d4e1655f
parentcc30b0e7901f753fabbfa08f10d0b3f9b5a54144
Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/SystemServer.java