tree 2a0a49aa649eb6f62951c6765feb567ae78f1442
parent 57723684f49c877c53f7c3991984f5157b8c309b
parent 0796187e95420b263c8e35a4a43a8749479bc559
author Jorim Jaggi <jjaggi@google.com> 1480934627 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480934630 +0000

Merge "Deprecate FLAG_DISMISS_KEYGUARD"