diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-09 14:57:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:57:48 -0800 |
| commit | e154d13b47d7a2bf5968a7c6070da15814d3c544 (patch) | |
| tree | ce0df52bd6db87dbbd294b0b0260ec9af29dd3db /media/libstagefright | |
| parent | 901e78d96eec495bda0dbe2e2b73009951301817 (diff) | |
| parent | 68c79e2bd8fce31fd826c2dd93ed639984c71cb2 (diff) | |
| download | frameworks_av-e154d13b47d7a2bf5968a7c6070da15814d3c544.zip frameworks_av-e154d13b47d7a2bf5968a7c6070da15814d3c544.tar.gz frameworks_av-e154d13b47d7a2bf5968a7c6070da15814d3c544.tar.bz2 | |
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
Diffstat (limited to 'media/libstagefright')
0 files changed, 0 insertions, 0 deletions