commit | 77f104a52df0cc5c4389dbb67252d72012444e62 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Sat Jun 11 00:01:50 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jun 11 00:01:50 2016 +0000 |
tree | e7d75a275ba144a01ed977b63747ae761662cbd7 | |
parent | 6cd7aa734985d0dc3771170142b5cf69b80de601 [diff] | |
parent | a3a86e70d35cfad82f6ac30304ed3919bc93906d [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 am: a3a86e70d3 Change-Id: I705381cac77edb100213b71a5ec5bb1d42f42037