| commit | a43e4a358572dd5865104b0c6510da984a08ab48 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Jun 05 14:43:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 14:43:01 2014 +0000 |
| tree | fd742e0109652ea2d5cd788b04cba4508e0dd280 | |
| parent | 88010cc278ce9fae87e97cea25ea22bc28c9e7ff [diff] | |
| parent | cb3d3a365c91ed996c47dea6ff1490f2f13c1b52 [diff] |
am cb3d3a36: (-s ours) am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor * commit 'cb3d3a365c91ed996c47dea6ff1490f2f13c1b52': DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor