tree f511bdaa7cfeecebfa575d546a7deb59473fb7da
parent 74d08b264718cd4026ec3acb918ae5c72adbb68f
parent 524f99469df44f47fd21d160b8434d40dd11bd65
author Abhishek Arya <aarya@google.com> 1440545117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440545117 +0000

am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev

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