| commit | 471b496e353b17df24beb1f507b62ce6a78767cd | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 05:24:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:24:39 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | a111f5e435896be18784c3ea133f901167ee68d1 [diff] | |
| parent | f64c2dd8b1be2e717518fed9239798ca4a09dae0 [diff] |
am f64c2dd8: (-s ours) am a4aed71a: am f1dc8e29: (-s ours) am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev * commit 'f64c2dd8b1be2e717518fed9239798ca4a09dae0':