| commit | dcca7ebd8b2a3e1584827d31838a1798df925df3 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:38:28 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 04 01:38:28 2017 +0000 |
| tree | 025f33eb058f72032771f81fdd58f0e7cc5a552a | |
| parent | c8adbea08392bb0a6d16abbd6e8111e516b54e3c [diff] | |
| parent | 05f4cd73b9655a6d4aad9fa215d6fc13c40633aa [diff] |
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev