| commit | d99bde0a620b07637d28db61eb3b1fecd5160197 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Wed Aug 26 21:12:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 21:12:26 2015 +0000 |
| tree | d25ae92866d66028820b551c6cc7ec5f5e424fc9 | |
| parent | dda361b370677e0cba85d91cc10f72f36b43a7a5 [diff] | |
| parent | a0ca0cca28f9fd418d17fb5f9f7aaf80ba9ebe16 [diff] |
am a0ca0cca: (-s ours) 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 'a0ca0cca28f9fd418d17fb5f9f7aaf80ba9ebe16': DO NOT MERGE - Fix software video decoder buffer size calculation