tree 45a0eb7dc22940877a340d3ac937dfed02048ff8
parent 197fe26940022be75384f4038dd789f446d33122
parent a8c57bf6adf3bdd477ce4d6ed8cca031c66830cd
author Tsu Chiang Chuang <tsu@google.com> 1329169297 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1329169297 -0800

Merge "extending timeout to stabilize tests" into ics-mr1