tree a1ccc97e8879f6bcdd401072e6eaa12852c49e25
parent 0e859b3bc0e776b6beac7c4cb993cf2a23e85e56
parent a4a4524adad910a01d8af8bd1fdb2e4530e9ce7c
author Patrick Tjin <pattjin@google.com> 1445033024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445033024 +0000

am a4a4524a: am 0f2848ad: (-s ours) resolved conflicts for 25016fd2 to lmp-mr1-ub-dev [DO NOT MERGE]

* commit 'a4a4524adad910a01d8af8bd1fdb2e4530e9ce7c':
  hwc: fix compilation issue on backport of Ieb91b70 [DO NOT MERGE]