summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2011-11-16 06:46:25 -0800
committerThe Android Automerger <android-build@android.com>2011-11-16 06:46:25 -0800
commitdb3d5c567abd752dcfa25f91f35c051ca0390efa (patch)
tree53fcc11f8c0d0fe164fe2de1d9939f23f65d97ec /libvideoeditor
parent482cedda9164b9f376dbe47644e33eb07db5b996 (diff)
parente796622a3a1a2f3be1f09d6b139bbb783fa712ec (diff)
downloadframeworks_av-db3d5c567abd752dcfa25f91f35c051ca0390efa.zip
frameworks_av-db3d5c567abd752dcfa25f91f35c051ca0390efa.tar.gz
frameworks_av-db3d5c567abd752dcfa25f91f35c051ca0390efa.tar.bz2
merge in ics-mr1-release history after reset to ics-mr1
Diffstat (limited to 'libvideoeditor')
0 files changed, 0 insertions, 0 deletions