tree b630b8680eda619b44851c0ae7faa1a53e199cb3
parent 42d875679869813ae0cc3d7ef3d5452e9f8ac772
parent 2967f48f8574ce35acd6c5e4e9f7872c64f159d5
author Jim Miller <jaggies@google.com> 1452646186 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452646186 +0000

Merge "Fix problem where keyguard shows spontaneously"