tree 2b7d04b580531314baccfb5333a56f03b9f11e5f
parent b03b155f66553a097c732b0728564dbca0886d0d
parent 984ef5ce8ef224cc6982e156bcafefc786e4fcc6
author Marco Nelissen <marcone@google.com> 1478278589 +0000
committer android-build-merger <android-build-merger@google.com> 1478278589 +0000

Merge "DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers" into nyc-mr2-dev
am: 984ef5ce8e

Change-Id: If298733545122d23b149a2eabbe882738da7673d