commit | a6d94e8dfe7a251066b74bb3f3a6722e0c2713b5 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Thu Mar 14 17:22:50 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 14 17:22:50 2013 +0000 |
tree | 7de9ee3f02514b0bb85b7eeb43f2bf2fd42894b1 | |
parent | 9943b7b9a5bfabe5f306f780fc9ab8ba9938a652 [diff] | |
parent | a11713ce3e81d7838092168fad110bea3212a9f3 [diff] |
am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev * commit 'a11713ce3e81d7838092168fad110bea3212a9f3': Increase screenshot timeout.