| commit | 8cd7e9442cfbd8247bb99c312f6e98649b3afe42 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Apr 16 16:19:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 16 16:19:14 2015 +0000 |
| tree | ca9b8578e4a8fac90cd27442baf2e47d57a4f61f | |
| parent | ec1c2c0fea5b82ecf480d32dd3679f8437f720eb [diff] | |
| parent | fb102b1b5107fced1fb7cfdb98b051efb3575ec5 [diff] |
am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"" * commit 'fb102b1b5107fced1fb7cfdb98b051efb3575ec5': Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"