tree 7e7ae715d649dbe344ee76ebb50d2d614619fd74
parent ce55e84315ba20297d58d4f8a15428a9b9b6adb5
parent 8d78693157cb3fa7ab1c9072ef913af4d67c6314
author Jorim Jaggi <jjaggi@google.com> 1478052852 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478052855 +0000

Merge changes from topic 'keyguard_refactor'

* changes:
  The big keyguard transition refactor (6/n)
  The big keyguard transition refactor (5/n)
  The big keyguard transition refactor (4/n)
  The big keyguard transition refactor (3/n)
  The big keyguard transition refactor (2/n)
  The big keyguard transition refactor (1/n)