OSDN Git Service

Merge "Merge "Add a Setting for whether or not we have been disabled by policy."...
authorDaniel Nishi <dhnishi@google.com>
Thu, 6 Jul 2017 22:26:43 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 22:26:43 +0000 (22:26 +0000)
commiteba0aa4123737b08ec281a18f5d01511fc2ba9dc
tree734e78e571f79a4b3601edef23079efc015fd1ae
parentec8ae2b409d5884e9c08f2c1416d659f8ce8615e
parent0398a0d1bd5c9e8438f97b6eb37b7b9f111c28b1
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619" into oc-dr1-dev-plus-aosp
am: 0398a0d1bd  -s ours

Change-Id: I929e2db602b3b927ac2bd46f04324fc3021d1302