commit | 48de12c5d1dc8d856724e8a1ec8288d9bfae40cd | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@android.com> | Tue Aug 14 18:50:59 2012 -0700 |
committer | android code review <noreply-gerritcodereview@google.com> | Tue Aug 14 18:51:00 2012 -0700 |
tree | d2a2780b6078d9481e0f4390763301604c2f79cb | |
parent | 9064a48365c131ef5f64b26ab33dd40a7d1246a7 [diff] | |
parent | 4b71686d09ef0e13e729338e3a549f2f63f80db1 [diff] |
Merge "Keep keyguard from starting after finished call when screen is on"