| commit | e45c4e42d26f13d2e405d1d87a665f5796cd1b6d | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Oct 09 12:18:02 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 09 12:18:02 2012 -0700 |
| tree | 67cdd6cac21b0e77f55932174531d5dca8008551 | |
| parent | af3cd21b08dd22d6ffd747c6314fd49fed3170a0 [diff] | |
| parent | 1cea2f3d87266a1d1df5d5f25fec2f026ca43206 [diff] |
Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev