tree b3df774a32fcf74c211046f25b9d6d67a8bed968
parent f1c0ce751a6b0518ddaa06c77be58551667643aa
parent 19b0c305ce965eceb375a31d4004cb087a9d0554
author Brian Muramatsu <btmura@google.com> 1339710377 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339710377 -0700

am 19b0c305: Merge "Increase timeout for IntentServiceTest" into jb-dev

* commit '19b0c305ce965eceb375a31d4004cb087a9d0554':
  Increase timeout for IntentServiceTest