summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-24 17:56:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 17:56:12 -0700
commit8d9d751a8f09a0199d1d22a3f8267eb51f919cc0 (patch)
tree04d040b8413da6f77a9048070156bf129f477171 /include
parentcf44040d93396e285fd064b1d452da249fea27f0 (diff)
parent67ca90b339feb8bb6889ca289a9dbc82c447b0d2 (diff)
downloadframeworks_base-8d9d751a8f09a0199d1d22a3f8267eb51f919cc0.zip
frameworks_base-8d9d751a8f09a0199d1d22a3f8267eb51f919cc0.tar.gz
frameworks_base-8d9d751a8f09a0199d1d22a3f8267eb51f919cc0.tar.bz2
am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2' * commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2': A first shot at proper support for seeking of rtsp streams.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions