summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Nicolas Roard <nicolasroard@google.com> 2011-03-14 15:39:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-14 15:39:37 -0700
commit644cd4baf674de1f5dcbced2b18e3cbd6eb20042 (patch)
treeb8497ded6aaf370feca2299360a4b12c867db928 /libs/utils/AssetManager.cpp
parent4030041e1d55eb4c0b1bc1ec84e205fd653aa5b9 (diff)
parent579a30dca29cfaf78b1315f8b439700001661bca (diff)
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 '65c282042dab1dfa75b10517190ba38834782c3b': 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