OSDN Git Service

Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
authorAdrian Roos <roosa@google.com>
Fri, 11 Aug 2017 12:20:21 +0000 (12:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 12:20:21 +0000 (12:20 +0000)
am: 3d558d8dd8

Change-Id: I2a05c3b5cbfe1f8bbd92ac85bc7544ab2c18b177


Trivial merge