OSDN Git Service

Merge "Remove AmrInputStream" am: 70b262b0f2 am: e57b37e423
authorMarco Nelissen <marcone@google.com>
Tue, 13 Dec 2016 23:35:15 +0000 (23:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 23:35:15 +0000 (23:35 +0000)
am: b10837952a

Change-Id: I03203e4fdbe66aaa89aae54457cf334b71f676dc


Trivial merge