tree 4c2c36e5ed03264c4a34d6f5702d0a995899fa52
parent 6704d6e810c17dff36cb003b214d4a5ba389210a
parent 9eb635c428367f0b67ed8acd5bc11f3275c400af
author Bryce Lee <brycelee@google.com> 1495745629 +0000
committer android-build-merger <android-build-merger@google.com> 1495745629 +0000

Merge "Use cached keyguard flags during relaunch." into oc-dev
am: 9eb635c428

Change-Id: I33a077d03618fdebebdd36af2e0db103fbd7ce3d