tree a54088232daddceff359314458976914b88d5c6f
parent 2db2153719d4b505a338773cb1745538084797dc
parent bcf32170b3cf27b3f8777314b86ce3a55252fb32
author Jorim Jaggi <jjaggi@google.com> 1473284129 +0000
committer android-build-merger <android-build-merger@google.com> 1473284129 +0000

Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev
am: bcf32170b3

Change-Id: Id3f66ab179421f6ff0d85128b06c5acf82209b11