OSDN Git Service

Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
authorKevin Chyn <kchyn@google.com>
Mon, 11 Sep 2017 21:48:55 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 21:48:55 +0000 (21:48 +0000)
commit1540738d55665efea456d97f2f0290a9c15d99d9
treeecac490a63005f1ebdc803b7d69792af24d4e8fa
parenta0c211120adaa7b135b2d08e8ccc1fc380832817
parentc6e9bb9da094862eac5206e860df1a1487043deb
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
am: c6e9bb9da0

Change-Id: Ib8e1512e06cc81ddf9e7f9beac1eef49d232ffc0