tree 907ed1a424b528ca31619df79d8173aa1d43a2b7
parent 3f2beacf3d6cdf6bcc429c8642edbd1f1d162362
parent 5a2d65c45e37e71bb26a7a78c5b6202077704e8a
author Jordan Liu <jminjie@google.com> 1517873394 +0000
committer android-build-merger <android-build-merger@google.com> 1517873394 +0000

Merge "Wake up from the standby mode and display message on the keyguard screen"
am: 5a2d65c45e

Change-Id: I2c413dd71ac812ccd907f31ab0f2ae64519cc375