summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTsu Chiang Chuang <tsu@google.com>2012-02-13 14:45:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-13 14:45:23 -0800
commit9d82346e812c8e23463b51453bedf6a6c53c06d7 (patch)
treedd2c9c93fa0a40b05dd74e4c7c5370a28133bcd2 /tests
parent5f94ac79517912a0c785618e9a7a1748ffa6197e (diff)
parent42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1 (diff)
downloadframeworks_base-9d82346e812c8e23463b51453bedf6a6c53c06d7.zip
frameworks_base-9d82346e812c8e23463b51453bedf6a6c53c06d7.tar.gz
frameworks_base-9d82346e812c8e23463b51453bedf6a6c53c06d7.tar.bz2
am 42a3e79d: am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1':
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions