From: Abhishek Arya <aarya@google.com>
Date: Tue, 25 Aug 2015 05:23:24 +0000 (+0000)
Subject: am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation... 
X-Git-Tag: android-x86-6.0-r1~35^2~2^2^2^2^2^2^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9a51893;p=android-x86%2Fframeworks-av.git

am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

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

f9a51893d739000cd70caf10c83d0e603371f5b1