OSDN Git Service

Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev am: d952a8b81a
authorKevin Chyn <kchyn@google.com>
Wed, 9 Aug 2017 01:27:38 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 01:27:38 +0000 (01:27 +0000)
am: 1aefc63ac5

Change-Id: I2e627486c4ed268aabb67aa7a1a892b18ffa21a4


Trivial merge