Android 6.0.1 Release 80 (MOB31Z)
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]
tree: a1ccc97e8879f6bcdd401072e6eaa12852c49e25
  1. msm8084/
  2. msm8226/
  3. msm8960/
  4. msm8974/
  5. msm8994/
  6. Android.mk