commit | 0ed0221e9c01753eb8cf312ea9d148a0097a99a1 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Wed Sep 01 21:41:51 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 01 21:41:51 2010 -0700 |
tree | 3a814e08f50ba1daf04f2f7974018426be2ed54a | |
parent | 2de8a82643a4c7e6c07a24f938d0674758484e60 [diff] | |
parent | bc4603b0b1f1242387655274e39649882ca391d1 [diff] |
Merge "Fix 2579224: Add a separate timeout for lockscreen vs display"