tree 5dc30333ce8a3706a7f2e095309e049a8672ed12
parent f3044fe20dee4db9986f2403631aca73738c397e
parent 7c6278de6e2aed171362012d578d8bd093c8f280
author Jesse Hall <jessehall@google.com> 1376800443 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376800443 -0700

am 7c6278de: Merge "Use new HWC display type/count constants." into klp-dev

* commit '7c6278de6e2aed171362012d578d8bd093c8f280':
  Use new HWC display type/count constants.