tree c47f5e4644417e0bcb83d753ee16ab175fda682e
parent e8c7d2b5df02b008173ed830d9c01496f8d39307
parent 204e8dc55cbe53624f7f5b16083073c20f47adad
author Marco Nelissen <marcone@google.com> 1478278813 +0000
committer android-build-merger <android-build-merger@google.com> 1478278813 +0000

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

Change-Id: I0e9b613920aa25343961b46d65cc15cd0b6f0110