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)
commit826ec83acb70a3cd7d22f921d3b2913d8c22bd11
tree242935a03d58f1df0d820d787a150c44df4d83e8
parent7a6ebe3d768ec940dd89453f29542c86a32e7c3c
parentc2ca590e8eabc43bc2c902cad6747789621d6e11
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
am: c2ca590e8e

Change-Id: I9191e85e58094d0326bf3b36c290e8b92e23dbd2