| commit | 5baf7ba5c8ad7dfa1b13406384a33c599e36d8c4 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Wed Aug 26 21:12:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 21:12:29 2015 +0000 |
| tree | d25ae92866d66028820b551c6cc7ec5f5e424fc9 | |
| parent | b55ca12a1d23dda1c706f135edacb3059bc1a2d4 [diff] | |
| parent | efb44f91009526ded780e4d8a69939899083846e [diff] |
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