tree 640eae42d9e4191b425679a0147c304724bc148f
parent e57a647c686ec044ed3677b40df441eac17beac3
parent 471b496e353b17df24beb1f507b62ce6a78767cd
author Abhishek Arya <aarya@google.com> 1440707835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440707835 +0000

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':