| commit | 89b95067e5f751a84256459f0d03635192defe30 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 05:24:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:24:42 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 0808d321fa43a9fc683876fe8e620153100f30fe [diff] | |
| parent | c1afc4ca51205fea77d5de6597a4d34db9f60bd1 [diff] |
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 'c1afc4ca51205fea77d5de6597a4d34db9f60bd1':