tree 68077b14de1d24d36ef7cce1c5bdc271cbcf5342
parent f4bd5f6bd44b7896d25e8a00b9f312ec2c6a54b1
parent b0f6b2906ed8924aed7fbfdaf55bd50ead238f32
author liuchao <liuchao741@huawei.com> 1487886487 +0000
committer android-build-merger <android-build-merger@google.com> 1487886487 +0000

Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a
am: b0f6b2906e

Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2