tree f200e6c9f63d54186a2ecb6ea93f42b819cb41b4
parent a118238405c163cdaedb9077abd53cd7f3982eba
parent 18c64569c83afcd95247bbd1920596051fa2bc5a
author Tsu Chiang Chuang <tsu@google.com> 1329172962 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329172962 -0800

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

* commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':