OSDN Git Service

Merge \\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\" into klp-dev...
authorMarco Nelissen <marcone@google.com>
Fri, 10 Jun 2016 23:19:51 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Jun 2016 23:19:51 +0000 (23:19 +0000)
commitcf1aed625841c82c050fc6d460f561038f772a9c
treecee3e47799d4eeda6875b6b6fabc4cacf1d18c6b
parent5979fb9ea906697efc0b5ee9d9fd030b549a85fb
parentfad42aa98d692c5fd830f7c61b4eb9faf4f7cdca
Merge \\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\" into klp-dev am: dc7357d201 am: 7e6001b97d
am: fad42aa98d  -s ours

Change-Id: Ie765e262139491ab9fb60bf81277ba6563d12fa4