| commit | 7425f17196e213390f54186ebc4ec7d7182d6c39 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 20:35:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:09 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | b5d10954305689290c1c175c23fdb68cefee71fd [diff] | |
| parent | 6f34bd6546ad33bdc0314e5642b880d28ac33d85 [diff] |
am 6f34bd65: am 22f74ac1: (-s ours) am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed. * commit '6f34bd6546ad33bdc0314e5642b880d28ac33d85':