OSDN Git Service

Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Thu, 6 Jul 2017 16:31:27 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:31:27 +0000 (16:31 +0000)
am: 789f10fe12

Change-Id: I86bf782941a26766de14e187270540dac32cf73a


Trivial merge