| commit | cdaed4e75ea8f071d997d0c5a8d9274ba469e3b3 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 20:37:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:37:19 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 79836c1decc98d21c7068f7431c45dcb36ddb2af [diff] | |
| parent | 89b95067e5f751a84256459f0d03635192defe30 [diff] |
am 89b95067: (-s ours) am c1afc4ca: (-s ours) 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 '89b95067e5f751a84256459f0d03635192defe30':