| commit | bcedcde8093b48c3d013cc57dde42bdd17d6dcb9 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jul 15 22:11:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:11 2015 +0000 |
| tree | f2d26566857eb9b79171a8b520d793ee6723e2cb | |
| parent | 773f1b2f919bb4c1f2724eabe8480b6589d8c498 [diff] | |
| parent | 204c2de8bb2a804991b8bbd5be9877ac1a52e150 [diff] |
am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev * commit '204c2de8bb2a804991b8bbd5be9877ac1a52e150': Improve tracking of screen on reasons.