diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-05-30 14:24:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 14:24:11 -0700 |
| commit | 03f705793d798887c388482d3513b714061a4067 (patch) | |
| tree | e41f59fcb7fd27d015cd21e36c38ef60b1751cab /media | |
| parent | a40cc472d26e36a23d00078cb925c3889d1fc0a0 (diff) | |
| parent | 268f5ccf7b8adf80f18ef8a9dac46a0813cec19f (diff) | |
| download | frameworks_av-03f705793d798887c388482d3513b714061a4067.zip frameworks_av-03f705793d798887c388482d3513b714061a4067.tar.gz frameworks_av-03f705793d798887c388482d3513b714061a4067.tar.bz2 | |
am 268f5ccf: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '268f5ccf7b8adf80f18ef8a9dac46a0813cec19f':
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions