tree 339a34252d15fc53cfd1aaea46b016137ad79299
parent 662c326e5fc02fa11226de1267b7f60485f5638a
parent 10385a17cb31de6fdf495b50d17a0afbec83e98e
author Craig Mautner <cmautner@google.com> 1379958390 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379958390 +0000

Merge "Ensure that activities behind keyguard are paused." into klp-dev