summaryrefslogtreecommitdiffstats
path: root/include/media/IMediaRecorderClient.h
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-20 17:50:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-20 17:50:53 -0700
commit4bb07bbd89624f30ea83b4596a6ce7716305df6c (patch)
treec69777403d456dd9d4181013de04c1f035c72184 /include/media/IMediaRecorderClient.h
parent7672db59680bded26c84521fcd936db5eeb19758 (diff)
parent35fb9ea84db148251973e1266904fd0949a6b2b1 (diff)
downloadframeworks_base-4bb07bbd89624f30ea83b4596a6ce7716305df6c.zip
frameworks_base-4bb07bbd89624f30ea83b4596a6ce7716305df6c.tar.gz
frameworks_base-4bb07bbd89624f30ea83b4596a6ce7716305df6c.tar.bz2
am 35fb9ea8: (-s ours) am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '35fb9ea84db148251973e1266904fd0949a6b2b1': DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Diffstat (limited to 'include/media/IMediaRecorderClient.h')
0 files changed, 0 insertions, 0 deletions