OSDN Git Service

Merge "AmrInputStream is not a public API"
authorMarco Nelissen <marcone@google.com>
Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)
commitfa55320f5dbaf9c4fa59e2f0169ff744c09f638b
tree11021a40214ad64ab46b126d96d2cf4da2c5a32d
parentb9b0886335da4f621a00fe3af879820a54502100
parentc3b1442d520cec596147e45757f433778db23614
Merge "AmrInputStream is not a public API"
am: c3b1442d52

Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb