tree e1e8bc174eb8e3e29646a8d4b5c5ed696d0acb1f
parent 30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026
parent ef9be616803b6de920f838f1bc12f611bc7e16a2
author liuchao <liuchao741@huawei.com> 1487886611 +0000
committer android-build-merger <android-build-merger@google.com> 1487886611 +0000

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

Change-Id: Ibfe81134a2089946800580538775faaa1bbe00ef