| commit | 47aa16b759f36d2855a024c07dd7ecb04cbff4c8 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Wed Jun 01 23:54:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 01 23:54:28 2016 +0000 |
| tree | 96eaf717fcfe42f5c6f1a8430a0f369db58c005a | |
| parent | 31d868f57eb67c4a00f371899c7d7bf8d0fbb602 [diff] | |
| parent | 1c81d9b563b21e8b94603daf6e691c20e0439df0 [diff] |
Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev am: 4c05d48b94 am: 1c81d9b563 * commit '1c81d9b563b21e8b94603daf6e691c20e0439df0': Change-Id: I59c44e63fd1c1bf256d02f8d05be015bdf832170