tree d688560b5d9f59b5d5d8ee7f5bddac7f6462a089
parent be64d4caf84f449c5c2ad5e3c59b8b0f2f7bda4e
parent 1baf17d5be43f673beda529f705ae10c7e945563
author Selim Cinek <cinek@google.com> 1433987446 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433987446 +0000

am 1baf17d5: am 059271ec: Merge "Reseting scrollposition to 0 when going to keyguard" into mnc-dev

* commit '1baf17d5be43f673beda529f705ae10c7e945563':
  Reseting scrollposition to 0 when going to keyguard