tree cdce7cb1c46d5ce87db706b2a8cbb09ae027660c
parent b7ba49c1a0463979f11f72d47fda46289e536e41
parent c9c40b829f4a555fcff520d265e2e60ac40ffb7e
author Robert Shih <robertshih@google.com> 1468459721 +0000
committer android-build-merger <android-build-merger@google.com> 1468459721 +0000

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

Change-Id: I5facfd78f7050928d30c86585036128749b1f292