OSDN Git Service

Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into...
authorSteven Ng <stevenckng@google.com>
Wed, 28 Sep 2016 17:04:04 +0000 (17:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 17:04:04 +0000 (17:04 +0000)
am: 27fc8ed383

Change-Id: Id769c6f609e2c5667a5b13e911d8543afb48cc04


Trivial merge