| commit | 40115d8608106708f6959fb8401f7b31112513e6 | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Fri Sep 11 19:44:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 19:44:52 2015 +0000 |
| tree | 2bcb8b9c95fa7b698e6e827e69041c256d107b0f | |
| parent | d20efd25a182dcebe32d0f0d0c84c97fa1fb869a [diff] | |
| parent | a96d6ff42b197a891019a12d5d065dd5ad144aef [diff] |
am a96d6ff4: am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev * commit 'a96d6ff42b197a891019a12d5d065dd5ad144aef':