tree d25ae92866d66028820b551c6cc7ec5f5e424fc9
parent b55ca12a1d23dda1c706f135edacb3059bc1a2d4
parent efb44f91009526ded780e4d8a69939899083846e
author Abhishek Arya <aarya@google.com> 1440623549 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440623549 +0000

am efb44f91: (-s ours) am 53aefba7: am 3a124eb0: am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

* commit 'efb44f91009526ded780e4d8a69939899083846e':
  DO NOT MERGE - Fix software video decoder buffer size calculation