summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2011-03-20 17:49:21 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-20 17:49:21 -0700
commita1840278485877de22c91302769f30af17fa392d (patch)
tree2aa2cb6936c908494527967d2b865eaf6392b787 /libs/utils/AssetManager.cpp
parent764bc9df66b430a4a011fbedb17c66ee3d3336a6 (diff)
parent1b085405bab32affbe73f77f1ecbf5b8855e95ab (diff)
am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '9a612b545e2c5249bfd8ef2b7673197b8f214cbd': DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions