OSDN Git Service

am 298b8004: am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabi...
authorTsu Chiang Chuang <tsu@google.com>
Mon, 13 Feb 2012 21:50:17 +0000 (13:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Feb 2012 21:50:17 +0000 (13:50 -0800)
commit22b2d2e9a402a9dfd2691cb627e5d8a6d3f720b9
tree2fe3e4c4f68b1797ac40886986f00e9924358d23
parentfe9b7415452e9eab5b8baf6502a62d148f5c1815
parent8139a24dbe09a83ef5a9c8f70573ca8565f1f5a1
am 298b8004: am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

* commit '298b8004ad1c2cff00676473c702bb4fc98a80a7':
  extending timeout to stabilize tests