tree 1dabb90309920e9e750a3e11665c7842b3da2fab
parent c6099c5de758c6fe8347458832f89f796f7a715d
parent 47e7aba999eeca7b2db97ca388bc9c42524eec8e
author Tomasz Figa <tfiga@google.com> 1433476665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433476665 +0000

am 47e7aba9: drm_gralloc: Add support for Rockchip DRM

* commit '47e7aba999eeca7b2db97ca388bc9c42524eec8e':
  drm_gralloc: Add support for Rockchip DRM