summaryrefslogtreecommitdiff
path: root/libs/utils/ObbFile.cpp
diff options
context:
space:
mode:
author Tsu Chiang Chuang <tsu@google.com> 2012-02-13 13:43:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-13 13:43:07 -0800
commit22e1920a7035ca8f5e3d6ed6e1655f6fd834e95d (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /libs/utils/ObbFile.cpp
parent97c154c789c4e50ef8c78ef17919bb023feaa663 (diff)
parent0137d87be04e182b4c5ffe5f22013c09111f63a7 (diff)
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb': extending timeout to stabilize tests
Diffstat (limited to 'libs/utils/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions