tree c6383b4dc0920ff890d8eb2c20f48aed357f56d2
parent 0d3afe66e2aa48de1251793670a7d7ab76c2f96a
parent e5c4d0a70f08d81d1a7020656594b1a9ca202f31
author Brian Muramatsu <btmura@google.com> 1339114912 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339114912 -0700

am e5c4d0a7: am f424208a: Merge "Increase Holo long timeout to 6 seconds" into jb-dev

* commit 'e5c4d0a70f08d81d1a7020656594b1a9ca202f31':
  Increase Holo long timeout to 6 seconds