tree 5b9fb0f0add24c797f7bdb74838fc03a10b8ebff
parent 432dce9ccc082f13eb32459838899e56b1bf6187
parent 60adf947e4452814ac9ec38947cc8a4260fa0497
author Manish Kumar <manishku@codeaurora.org> 1441619423 +0530
committer Manish Kumar <manishku@codeaurora.org> 1441694020 +0530

Merge commit '60adf947e4452814ac9ec38947cc8a4260fa0497' into remote branch.

Conflicts:
	libhwcomposer/hwc.cpp

Change-Id: Ia02d7eaf50dbc16729a4532370ebbe94893826e2