tree ddf99065454c0870f8025d50ec48aeecc1999044
parent 9eb138bc4527e9cb362adeaac3efa9267302ecc7
parent 14d8ba77361f21e7b1a4d23cce89cabfed96c465
author Marco Nelissen <marcone@google.com> 1506717130 +0000
committer android-build-merger <android-build-merger@google.com> 1506717130 +0000

Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d am: 9bda8fddf2
am: 14d8ba7736

Change-Id: I869b0944ad119d9adc83ec21e15ae791294d7230