summaryrefslogtreecommitdiff
path: root/libs/utils/ZipFileRO.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-10-01 21:49:39 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-01 21:49:39 -0700
commita4d45cda697dbd8fa164766b87163d1b0469bd81 (patch)
tree4d24c7155ac21ba0eb164798391cfb099dd58f14 /libs/utils/ZipFileRO.cpp
parent0f5f2e4c27612e2cda231473aec0c06838ff3750 (diff)
parentea58d1bac2960c1794f048bfa5d1a60b1a3d23a1 (diff)
am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1' * commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1': Wait for initial device scan to finish before updating config.
Diffstat (limited to 'libs/utils/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions