OSDN Git Service

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

Change-Id: Ib32029cce0ce9b7d6b0c51ad9a5e141b40a34304