tree 71dfec0b8c6d33c5101185fc23a624548c44e706
parent 932f36050c65e7df1cf211ead3f57149fff357f2
parent 9d22950fc828868983b455439bb2afbdf95def58
author Android Build Merger (Role) <android-build-merger@google.com> 1499378815 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499378815 +0000

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