tree a6d9c74cea545d1f74d98284d2122e57f3116f62
parent 95333359b939d4e4b4a546d6f38e2f82258f8b31
parent 50650f44fd1c18620bc39a4458f38974eef61402
author Manish Kumar <manishku@codeaurora.org> 1442829678 +0530
committer Manish Kumar <manishku@codeaurora.org> 1442902494 +0530

Merge commit '50650f44fd1c18620bc39a4458f38974eef61402' into private_redfox64_mbr.

Conflicts:
	hal/msm8974/platform.c

Change-Id: Ie0bb8b8a122ead1e46476bb4eb7ec5e3e34108e0