OSDN Git Service

Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed
authorMarco Nelissen <marcone@google.com>
Wed, 14 Dec 2016 17:12:59 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 17:12:59 +0000 (17:12 +0000)
am: 8b1eed4ee8

Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa


Trivial merge