| commit | c1afc4ca51205fea77d5de6597a4d34db9f60bd1 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Wed Aug 26 20:35:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 20:35:25 2015 +0000 |
| tree | adcb0543af4064db78d96a9d999c86ba0c30eb93 | |
| parent | a7d5bdbbb7eeb768c71c53b231cafb96a04d0904 [diff] | |
| parent | 3a124eb05e7ef3056ebc1abc7390e8371dd52112 [diff] |
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 '3a124eb05e7ef3056ebc1abc7390e8371dd52112': DO NOT MERGE - Fix software video decoder buffer size calculation