OSDN Git Service

Merge "Fingerprint navigation settings is a secure setting" am: ccf1064825
authorKevin Chyn <kchyn@google.com>
Wed, 21 Mar 2018 04:54:54 +0000 (04:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Mar 2018 04:54:54 +0000 (04:54 +0000)
am: 85f47ce5aa  -s ours

Change-Id: I6213d4a0aed834e46f256c30bb75dc2881cd5bf5


Trivial merge