| commit | 4c836c6f94283cdccf3b630fbd81e8fc9de0b2b7 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 01:39:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:39:50 2015 +0000 |
| tree | ceb525f73c6a717e50a1162d566ec5e5d6bf04f2 | |
| parent | 53e8e7266a47ddcb0e0c63fa352a7e157144ec67 [diff] | |
| parent | bc76a8902d39a057b02b180e8f18520d8e9f701b [diff] |
am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed. * commit 'bc76a8902d39a057b02b180e8f18520d8e9f701b': SoftAVCEncoder: fix auto merge error, member names have changed.