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