summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-10-04 15:48:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-04 15:48:59 -0700
commitdeed343476e45165ed176c036c8f77b170bacfeb (patch)
tree28cdb014b5126c76b3f3e9638370e077628d2dc4 /include
parent8b62c6ae868e01f4c5783566fe2fa20408b61caf (diff)
parent3754a7901b6bed448eaecfbd29a4705b30a6b656 (diff)
downloadframeworks_av-deed343476e45165ed176c036c8f77b170bacfeb.zip
frameworks_av-deed343476e45165ed176c036c8f77b170bacfeb.tar.gz
frameworks_av-deed343476e45165ed176c036c8f77b170bacfeb.tar.bz2
am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp * commit 'b99f0c7eae365f788a21944fef28de580c7f5f92': Resilent media time stamp adjustment
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions