| commit | 204c2de8bb2a804991b8bbd5be9877ac1a52e150 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jul 15 21:59:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:59:27 2015 +0000 |
| tree | 86929e2a670f2a34f78fc66721cf1f476f5883af | |
| parent | 26fa501dd6bf906344dd6ba3ff4d110b735a3547 [diff] | |
| parent | c7b0435cc709c328da8e2b515ea04c8bc40d1094 [diff] |
am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev * commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094': Improve tracking of screen on reasons.