am a36f7c45: am 177dd33d: Manta: exynos: libcamera2: plug /dev/ion file descriptor...
authorMark Salyzyn <salyzyn@google.com>
Mon, 27 Oct 2014 04:21:09 +0000 (04:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 04:21:09 +0000 (04:21 +0000)
* commit 'a36f7c45d5308ec6df2db0365e3f90ca6edd56a3':


Trivial merge