| commit | 977abbb887cfaf7cd8a0d31235281fbdd639ac19 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@android.com> | Tue Aug 14 19:31:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 14 19:31:55 2012 -0700 |
| tree | 161175fbbc63e0d691e2ad121fca20a10d3333b3 | |
| parent | d54bc8009f745a5f730fa013bb0084c502b18aa9 [diff] | |
| parent | 48de12c5d1dc8d856724e8a1ec8288d9bfae40cd [diff] |
am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" * commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd': Keep keyguard from starting after finished call when screen is on