tree 2746d68470a048e6ce5b886fd9afac7351ad130b
parent e9a3a244bf823fcab5bfa07056bea64f55e412fb
parent f67f894fead9065dcffda03a127cee7d746c9226
author Abhishek Arya <aarya@google.com> 1440621060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440621060 +0000

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 'f67f894fead9065dcffda03a127cee7d746c9226':
  DO NOT MERGE - Fix software video decoder buffer size calculation