tree 4a5c1a69ec2dff561077ae219fd7c1ca1aed41d9
parent f725749478d0c71be35c1ada36fdc92f7f874dc6
parent ce29a4c77a041c5073200fa36d534165dc674400
author Wonsik Kim <wonsik@google.com> 1507067842 +0000
committer android-build-merger <android-build-merger@google.com> 1507067842 +0000

Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552 am: b7079d6381
am: ce29a4c77a

Change-Id: Ia99a5f14249a5f3cbcc6543533f5af128fe2ae85