| commit | 4bc69bd18e68bf33b6e235ca482286e8467978ac | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Jun 14 14:46:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 14 14:46:17 2012 -0700 |
| tree | b3df774a32fcf74c211046f25b9d6d67a8bed968 | |
| parent | f1c0ce751a6b0518ddaa06c77be58551667643aa [diff] | |
| parent | 19b0c305ce965eceb375a31d4004cb087a9d0554 [diff] |
am 19b0c305: Merge "Increase timeout for IntentServiceTest" into jb-dev * commit '19b0c305ce965eceb375a31d4004cb087a9d0554': Increase timeout for IntentServiceTest