OSDN Git Service

Merge "Make AmrInputStream use MediaCodec" am: 866658261f
authorMarco Nelissen <marcone@google.com>
Fri, 11 Nov 2016 20:16:00 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 20:16:00 +0000 (20:16 +0000)
am: 618c1a9ae6

Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb


Trivial merge