summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Dan Egnor <egnor@google.com> 2010-05-06 17:33:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-06 17:33:45 -0700
commite3c233d1a994459969efc7b6fd0309a82ec220db (patch)
tree031f03af99732267299954bd3ecab17ec2a7ee8f /libs/utils/AssetManager.cpp
parent1a5b93a2d95106807ca069bfb5e74d6da86283ee (diff)
parent359b3fd8d8351ac2abc3ec65f355d4fe9d5b9c31 (diff)
am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp * commit '8a8658a5de261c2da72d431940877bd054bc9837': Make static versions of libutils and libbinder.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions