commit | efb44f91009526ded780e4d8a69939899083846e | [log] [tgz] |
---|---|---|
author | Abhishek Arya <aarya@google.com> | Wed Aug 26 20:57:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 20:57:20 2015 +0000 |
tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
parent | 2f6dcbf1fef245169250d63ee23af84c20a5add9 [diff] | |
parent | 53aefba70a846a0b435212aa13c010ae914b67d2 [diff] |
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 '53aefba70a846a0b435212aa13c010ae914b67d2': DO NOT MERGE - Fix software video decoder buffer size calculation