tree 1a8924da9a975e199d300dfa7b7d689d221d110b
parent 5d05c38db22aedaef35b31124e5dded06f516e51
parent ef977699de69f6d8f016cc98cf2fcadbb9632a18
author Santhosh Behara <santhoshbehara@codeaurora.org> 1518123229 +0000
committer android-build-merger <android-build-merger@google.com> 1518123229 +0000

Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149a9 am: 8347d50e63
am: ef977699de

Change-Id: Ie964845732468495bde286ed73f517362c81b8be