tree 9de5e9fa34ef8d3cdb484a651733b6272d265c04
parent 29a0dda797b58108d148e7f25371f892f84205d4
parent cae696156f1e60006e39821e79a1811ae1933c69
author Android Chromium Automerger <chromium-automerger@android> 1407925366 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1407925366 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: Id78cd5b89eb2bcfc348b462270b1025e1d16a383