tree 7de9ee3f02514b0bb85b7eeb43f2bf2fd42894b1
parent 9943b7b9a5bfabe5f306f780fc9ab8ba9938a652
parent a11713ce3e81d7838092168fad110bea3212a9f3
author Jeff Sharkey <jsharkey@android.com> 1363281770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363281770 +0000

am a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev

* commit 'a11713ce3e81d7838092168fad110bea3212a9f3':
  Increase screenshot timeout.