| commit | 34526d6ad40829f384de08c344c46030551eed2d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Aug 04 01:52:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 04 01:52:42 2017 +0000 |
| tree | 395fb39e771caed9b1787ef8c9b1bbaea5ca0a6f | |
| parent | 3c5628cf5aba10398e4bee6c80200aa1c13a17a3 [diff] | |
| parent | ca6eec64201158e4cca203ff03510f32d7bbeec9 [diff] |
Merge "Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b am: ddc0123df7" into oc-mr1-dev-plus-aosp