OSDN Git Service

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
authorAjay Nadathur <ajayns@google.com>
Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)
am: f5ebc6f7ed

Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb


Trivial merge