diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-01 07:51:57 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-01 07:51:57 -0700 |
commit | 05caa74872df1258bbf4473fe6d222a9487fe051 (patch) | |
tree | 94c792fecaf7231721305c1ace5a04fe2558536b /media/libstagefright | |
parent | 6a52c12da5dfe279fa6fb4a0a02db49a0dfbc1de (diff) | |
parent | 2888da87eb910648665fb3e16f6b389b808997eb (diff) | |
download | frameworks_av-05caa74872df1258bbf4473fe6d222a9487fe051.zip frameworks_av-05caa74872df1258bbf4473fe6d222a9487fe051.tar.gz frameworks_av-05caa74872df1258bbf4473fe6d222a9487fe051.tar.bz2 |
Reconcile with jb-mr1-release - do not merge
Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44
Diffstat (limited to 'media/libstagefright')
0 files changed, 0 insertions, 0 deletions