tree efb5cbc5ed5dfbb2b71e8928d028aa87e4f57800
parent d5ec9b94951bc8777de9f665ffe3210000da636d
parent 4bc69bd18e68bf33b6e235ca482286e8467978ac
author Brian Muramatsu <btmura@google.com> 1339710544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339710544 -0700

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

* commit '4bc69bd18e68bf33b6e235ca482286e8467978ac':
  Increase timeout for IntentServiceTest