OSDN Git Service

Merge "Merge "Add a Setting for whether or not we have been disabled by policy."...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 22:20:56 +0000 (22:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 22:20:56 +0000 (22:20 +0000)
commitf4482a5c5baea7e6a70bc3d3e43d2addbf7e3e86
tree734e78e571f79a4b3601edef23079efc015fd1ae
parent6693cbb26bb3f46aeaa2f1da0a1a18944a7f192b
parent425955f7cab88411bd03063c1ceb743d8dd3414c
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 am: 932f36050c  -s ours"