tree 43f299509a0a7395ca7f6d4dcb6cb1791bda454a
parent abf1e03398cfdaf2e30d5c740043a0494b23164b
parent 2e56339a4a1133e9aface1c851f1ab67cff72109
author Jim Miller <jaggies@google.com> 1437000032 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437000032 +0000

am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.