tree 67cdd6cac21b0e77f55932174531d5dca8008551
parent af3cd21b08dd22d6ffd747c6314fd49fed3170a0
parent 1cea2f3d87266a1d1df5d5f25fec2f026ca43206
author Winson Chung <winsonc@google.com> 1349810282 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349810282 -0700

Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev