| commit | 697a449f2b21ac72dcb0bda9932359398506105f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jun 24 20:45:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 20:45:21 2015 +0000 |
| tree | d0f457e169b8ad5a21b8137a240bb08e559d7f16 | |
| parent | 53670d357f1d2321841d6fc898d8caeee82390d0 [diff] | |
| parent | 37009e46e5e935849384819d5db3e8b83d554947 [diff] |
am 37009e46: Merge "SoftAVCEnc: Added support for Main Profile encoding." * commit '37009e46e5e935849384819d5db3e8b83d554947': SoftAVCEnc: Added support for Main Profile encoding.