OSDN Git Service

Merge "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:28:43 +0000 (22:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 22:28:43 +0000 (22:28 +0000)

Trivial merge