tree 3643c0ac51c24791ff4c3e063496b0a39cb5647b
parent 84affb8ae6477c46c75f834b73daa13b2a751c21
parent 3ded587cc199d4ba592e675dc47fb80a28d1dacd
author Tsu Chiang Chuang <tsu@google.com> 1329172788 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329172788 -0800

am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':