tree 3643c0ac51c24791ff4c3e063496b0a39cb5647b
parent d1f88de2c496423e483760654a4381b563dc1e1d
parent eb56ad183af8a9833ff22a22b97f174f05266c58
author Tsu Chiang Chuang <tsu@google.com> 1329169506 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329169506 -0800

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

* commit 'eb56ad183af8a9833ff22a22b97f174f05266c58':
  extending timeout to stabilize tests