| commit | 8b6d0ccc8f56ea96588756cd1090bfae1814066a | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 20:37:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:37:15 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | e57a647c686ec044ed3677b40df441eac17beac3 [diff] | |
| parent | 471b496e353b17df24beb1f507b62ce6a78767cd [diff] |
am 471b496e: (-s ours) am f64c2dd8: (-s ours) 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 '471b496e353b17df24beb1f507b62ce6a78767cd':