commit | a0ca0cca28f9fd418d17fb5f9f7aaf80ba9ebe16 | [log] [tgz] |
---|---|---|
author | Abhishek Arya <aarya@google.com> | Wed Aug 26 20:57:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 20:57:17 2015 +0000 |
tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
parent | 6ac75b61e1c6fd713b403904ca48e7d711a3a142 [diff] | |
parent | 1e5decfc5d881e88b3a970f22f34ba7b673f9ffd [diff] |
am 1e5decfc: am a4aed71a: am f1dc8e29: (-s ours) am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev * commit '1e5decfc5d881e88b3a970f22f34ba7b673f9ffd': DO NOT MERGE - Fix software video decoder buffer size calculation