| commit | aa1a35ba277019827aca33014f1e09d01831fc7d | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jul 15 22:40:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:40:32 2015 +0000 |
| tree | 43f299509a0a7395ca7f6d4dcb6cb1791bda454a | |
| parent | abf1e03398cfdaf2e30d5c740043a0494b23164b [diff] | |
| parent | 2e56339a4a1133e9aface1c851f1ab67cff72109 [diff] |
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.