summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:24:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:24:38 -0800
commitf0e3acd06af00c07bfb541090b5349618fa67507 (patch)
tree2c99308c800c64b395da698a4a6b8604e780d4b4 /libvideoeditor
parent13f460ba715c26096f168616ca4b449e4445403a (diff)
parent86ee26bf99d8937d6dfd3aaee7965368e1612a62 (diff)
downloadframeworks_av-f0e3acd06af00c07bfb541090b5349618fa67507.zip
frameworks_av-f0e3acd06af00c07bfb541090b5349618fa67507.tar.gz
frameworks_av-f0e3acd06af00c07bfb541090b5349618fa67507.tar.bz2
am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':
Diffstat (limited to 'libvideoeditor')
0 files changed, 0 insertions, 0 deletions