| commit | 14d8ba77361f21e7b1a4d23cce89cabfed96c465 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Sep 29 20:21:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 29 20:21:30 2017 +0000 |
| tree | 9003ecbe63b41f7d32358d9d89424d2fd13d1588 | |
| parent | e3bcc71185ceea64c907254049682d171c24f195 [diff] | |
| parent | 9bda8fddf247427de51edfc08c042679774f327d [diff] |
Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d am: 9bda8fddf2 Change-Id: Ib6e7f401af259e422aee6ca7d18703f380ef08f6