tree f727676b8060d3a1966c0e8e37855aaee8b4e216
parent 0d1f79f4f8b34aa22184b28cb6f5b63cbca0e5c4
parent dd52457296df1ef41bae8e28dc321d6798509172
author Android Chromium Automerger <chromium-automerger@android> 1385571487 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1385571487 +0000

Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at dd52457296df1ef41bae8e28dc321d6798509172

This commit was generated by merge_from_chromium.py.

Change-Id: I3e46f087214a185058a75147e2060a93b087e297