tree c588670a88b49c87127a1d8a7786aec85eebcd45
parent 4c9583c1f12f50a19c1fbac3c0a0de54cd18a7d8
parent e217625aecb78711739dfc4e52295422ed37e24a
author Brian Muramatsu <btmura@google.com> 1339707232 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339707232 -0700

Merge "Increase timeout for IntentServiceTest" into jb-dev