tree 2e615ec74ba7f4c2562c5b2da7bcd3943fecfa9c
parent 3bad687e1ded50502a7dfb385e4cf33bde2c528d
parent e4044bb617ea849939058d953e250fcd540c75cc
author Jim Miller <jaggies@google.com> 1463010307 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463010309 +0000

Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev