summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Neal Nguyen <tommyn@google.com> 2010-05-06 16:12:22 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-06 16:12:22 -0700
commit649f6f64b43845dfa0402abfb4568c0f47707eeb (patch)
tree40d6996de15cbcb1c922b87f867cfac75f40dc31 /libs/utils/AssetManager.cpp
parent3877d301aaaec0590fe815ec6185ea646e59aaf3 (diff)
parentad8507cfdc9171457b405b2c781e1d72ee5f0cb4 (diff)
am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp * commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4': Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions