tree c40a87063b8cd605c3f671a31524ecf8f7068af7
parent d2a4c2fa8fdaeb6bc4a51cb26b3419c5e5e1c083
parent 8885596a9109794ebd61e6a91e5199aa1750ed8c
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':