| commit | a3a86e70d35cfad82f6ac30304ed3919bc93906d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jun 10 23:58:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 10 23:58:04 2016 +0000 |
| tree | 5d187c3f5b2e4f0a0c0a6936b0070957860c7417 | |
| parent | 12d3f3801d46fbe977c79aa8cb6f352cafa90707 [diff] | |
| parent | 95e69fe5c104a3ad2fbd19b0c66cc3309fa5754c [diff] |
Merge \\\\\\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\\" into klp-dev am: dc7357d201 am: 7e6001b97d am: fad42aa98d -s ours am: cf1aed6258 -s ours am: 635dddcdcb am: d0244980ba am: 2946f9790e -s ours am: b6ba5f9016 am: 95e69fe5c1 Change-Id: I4b8285fb1666b8141361c40c4bfb65bdc208c80d