summaryrefslogtreecommitdiff
path: root/libs/utils/ZipFileRO.cpp
diff options
context:
space:
mode:
author Daisuke Miyakawa <dmiyakawa@google.com> 2010-08-24 13:39:42 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-24 13:39:42 -0700
commitff547a59494206a1555eafa296b68961b677ba90 (patch)
tree9d5d366fc46159daaba512506d83a65824cfffb9 /libs/utils/ZipFileRO.cpp
parent28060c8a806b58fc53f281688146877e8c37a504 (diff)
parent88bff62c35e570a0c86eb55ded79d4600730226b (diff)
am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp * commit '88bff62c35e570a0c86eb55ded79d4600730226b': Fix vCard so that it looks at IM correctly.
Diffstat (limited to 'libs/utils/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions