tree f5f6a65b1d99cbb8d5b38fb83c68ecda67227d19
parent 4d269ba32037485bfa5ffba4dd23f796cbf10c43
parent 1dc406505cdcbbf98ece4f15a2f98f621e24abdb
author Selim Cinek <cinek@google.com> 1416228894 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416228896 +0000

Merge "Increases the falsing threshold when for the keyguard affordances" into lmp-mr1-dev