tree aa091ad9426bc2236873f0f76acb7897867c3c8d
parent c7dd19198c521cb1841d34b4a5827bf324c3d0f9
parent 29f09eb29571cf345749ce3a8bc077882c529777
author Robert Shih <robertshih@google.com> 1468459890 +0000
committer android-build-merger <android-build-merger@google.com> 1468459890 +0000

Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f
am: 29f09eb295

Change-Id: Ib65bf1a2dd56dfa84881a18acf0ba1871cdff38c