commit | f64c2dd8b1be2e717518fed9239798ca4a09dae0 | [log] [tgz] |
---|---|---|
author | Abhishek Arya <aarya@google.com> | Wed Aug 26 20:35:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 20:35:23 2015 +0000 |
tree | adcb0543af4064db78d96a9d999c86ba0c30eb93 | |
parent | b7ac716b2b31a8536d0379c6dd85b8f7e74017f1 [diff] | |
parent | a4aed71aa70480fd717e53ee9d471c56714c42be [diff] |
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 'a4aed71aa70480fd717e53ee9d471c56714c42be': DO NOT MERGE - Fix software video decoder buffer size calculation