summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2011-03-15 14:49:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-15 14:49:37 -0700
commitdd50b8a8bf45918f04a641315fe7ff9993bd9f71 (patch)
tree3df13b324209e6ab022e8508522255c975507533 /libs/utils/AssetManager.cpp
parentc0ab47832c01ecb66d2fa2d0a9ffe560a604a4e4 (diff)
parent79ae55e0518d561008d84c3fd067f0a795b95fbd (diff)
am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit 'b09763209980ff9210cc353f2410598220ec0480': DO NOT MERGE: Backport more USB accessory changes from honeycomb
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions