OSDN Git Service

Merge "FRP: Fix crash after lockout" into oc-mr1-dev
authorAdrian Roos <roosa@google.com>
Wed, 9 Aug 2017 10:05:49 +0000 (10:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 10:05:49 +0000 (10:05 +0000)
am: c2ca590e8e

Change-Id: I9191e85e58094d0326bf3b36c290e8b92e23dbd2


Trivial merge