summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2011-03-14 07:10:07 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-14 07:10:07 -0700
commit693ba2bf0a7a9fe89d5915a015f6c9eb953d24b8 (patch)
tree6d362a266557b90295fa9667d58c8e4325085dd7 /libs/utils/AssetManager.cpp
parentbec7f096cb0291090e6e6c87367dc4b4abd673ec (diff)
parent817b0a5efde8726a293ffd8ed5396470a5c89553 (diff)
am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
* commit '151c74b3c679a1799d01f210a2a3f4a658154320': Add a dialog to ask user to start an application for a USB device or accessory
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions