tree a5b01e7714e08c28da6d945bea0296d013cbaccf
parent 6a7d057e021e0786d7934baed16fb6e358a9d93b
parent 6047b028a8f49938cd5c85890dcabdf7a9b7561f
author Jim Miller <jaggies@google.com> 1283402511 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283402511 -0700

Merge "Fix 2579224: Add a separate timeout for lockscreen vs display"