| commit | 51a7d57761833c29117f67df5e1a9cca3a145d18 | [log] [tgz] |
|---|---|---|
| author | Manish Kumar <manishku@codeaurora.org> | Mon Sep 07 15:20:23 2015 +0530 |
| committer | Manish Kumar <manishku@codeaurora.org> | Tue Sep 08 12:03:40 2015 +0530 |
| tree | 5b9fb0f0add24c797f7bdb74838fc03a10b8ebff | |
| parent | 432dce9ccc082f13eb32459838899e56b1bf6187 [diff] | |
| parent | 60adf947e4452814ac9ec38947cc8a4260fa0497 [diff] |
Merge commit '60adf947e4452814ac9ec38947cc8a4260fa0497' into remote branch. Conflicts: libhwcomposer/hwc.cpp Change-Id: Ia02d7eaf50dbc16729a4532370ebbe94893826e2