summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2009-12-15 07:40:02 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-12-15 07:40:02 -0800
commit545125a490c5b2645b631f100c7cde8701ed0564 (patch)
tree7d5330152c49ca35fd3948d913acff0edebb6230 /libs/utils/AssetManager.cpp
parent0fb263888f1f07b8539462812dedc56cee552bbf (diff)
parentc7b99dadcc42410f113e9c98de6d11daf0441726 (diff)
am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp * commit '7585586ce5b5de699b95125672e29eaf70876727': sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions