OSDN Git Service

Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
authorJustin Klaassen <justinklaassen@google.com>
Wed, 9 Aug 2017 20:01:40 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 20:01:40 +0000 (20:01 +0000)
commit6652cfcd7e90e0915e28f4a819f53a0184287347
tree2480e9049c5a7fb60f2f0de8b360f3c0baeca90d
parentfa0f823f797d1be943debe9ccf56dedfc1c2f0b5
parentd59854de246322711ce12d0d53cfd589060b02c1
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am: d59854de24

Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af