summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-03-17 19:05:08 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-17 19:05:08 -0700
commit5d1e292b8824c8038e649d145f8bb1123b5149b5 (patch)
treeabb3eb43ca814a49ecc5d8c984405730266f881c /libs/utils/AssetManager.cpp
parentf4958842115514148167df96fe1485ae8091127d (diff)
parent1828fd2a08f26d80426e8144903c393fd1787991 (diff)
am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
* commit 'efb56934efdc0aae38ce7264f2576326293846b6': Whoops, forgot the HONEYCOMB_MR1 constant. :(
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions