tree d10172a8a7c8b234b26a5ab5b95b673497afbc36
parent ed92230c38ded1b434dfe546944a85e404f1299a
parent 8ac1bff7e23ac984568652e1c5e9ffc7dd47e341
author Nancy Zheng <nzheng@google.com> 1485206629 +0000
committer android-build-merger <android-build-merger@google.com> 1485206629 +0000

Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
am: 8ac1bff7e2

Change-Id: Ia6a1596958bb151ec58e869587bc2201ba0ebc4f