summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Nicolas Roard <nicolasroard@google.com> 2011-03-14 16:36:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-14 16:36:50 -0700
commit1a26fd48c8e98fcee95d9cdd57f77709f4393260 (patch)
tree8d2889e1ccade689a5f21236cb375f9a23734568 /libs/utils/AssetManager.cpp
parent531223a9f46370b25a41ec6b830cb1dd854e301f (diff)
parent644cd4baf674de1f5dcbced2b18e3cbd6eb20042 (diff)
am 373ece1f: am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
* commit '373ece1fa158d72152712b36674a9c114a40b649': Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions