tree 2606c6f9d9ce87799f0a8d2ac60a263188da4a07
parent ca5104eb946179b7659f42e027ca2adb4bcc15e2
parent dcca7ebd8b2a3e1584827d31838a1798df925df3
author Zhijun He <zhijunhe@google.com> 1501811173 +0000
committer android-build-merger <android-build-merger@google.com> 1501811173 +0000

Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev
am: dcca7ebd8b

Change-Id: I6ef1beaa0ccae2312260164cc9687105f06810af