tree cfe811876de87135ff08c1cfddf6356479f09d1a
parent 9afbfaf52ef146f8b6585304d85f46f7bd9b009f
parent 0bed7f258ba1fffc10f986ee043b769f1fd40ad3
author Jorim Jaggi <jjaggi@google.com> 1396893558 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396893558 +0000

Merge "Always go through bouncer when unlocking" into master-lockscreen-dev