tree a70b1755b194775205be0292394498a79483c209
parent 923e706576d438b162d8e1a0a3455ffd1082da1c
parent dcb6efcd5565763b1590667cf16182f559d2fdda
author Adrian Roos <roosa@google.com> 1480981393 +0000
committer android-build-merger <android-build-merger@google.com> 1480981393 +0000

Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
am: dcb6efcd55

Change-Id: I5e4b04c054522f7620a0a8e1b37830cf2e3711da