tree f3f90285d503a02b3f347f0c461738020c033152
parent 0bb9d8327500c265c2efd82449db23421cd70d83
parent e5238f7a8db90ebc0e8875adaff84efc198f0800
author John Spurlock <jspurlock@google.com> 1412023695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023695 +0000

am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev

* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.