Merge "IOMX: Enable buffer ptr to buffer id translation for arm32" into lmp-dev

author Andy Hung <hunga@google.com>

Wed, 27 May 2015 01:31:28 +0000 (01:31 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 27 May 2015 01:31:29 +0000 (01:31 +0000)
author Andy Hung <hunga@google.com>
Wed, 27 May 2015 01:31:28 +0000 (01:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 May 2015 01:31:29 +0000 (01:31 +0000)
diff --cc media/libstagefright/omx/OMXNodeInstance.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Wed, 27 May 2015 01:31:28 +0000 (01:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 May 2015 01:31:29 +0000 (01:31 +0000)