summaryrefslogtreecommitdiff
path: root/libs/utils/ZipFileRO.cpp
diff options
context:
space:
mode:
author Xia Wang <xiaw@google.com> 2010-05-06 16:12:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-06 16:12:38 -0700
commit3e6c1696135f267cc59d050747839c56ce868ef9 (patch)
tree0dcc0ae73f47ad3e2311fd25a9d96ebcf1ed052f /libs/utils/ZipFileRO.cpp
parent60b02cab9cba74e4fe1fcbe64af85ed867d20cf9 (diff)
parent11505b474b16457fb65952aadba0609cb33de8e7 (diff)
am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp * commit '11505b474b16457fb65952aadba0609cb33de8e7': Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Diffstat (limited to 'libs/utils/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions