tree cf10a462b80480153b515123dbd30ee8bfc24c60
parent c04e1084f46289becfd649bf123d8b218dd5bc1f
parent 6fc5c6034e053b591394efe6d66b00f4249c4f66
author Naveen Kumar <kumarn@codeaurora.org> 1482837452 +0530
committer Naveen Kumar <kumarn@codeaurora.org> 1482837452 +0530

Merge commit '6fc5c6034e053b591394efe6d66b00f4249c4f66' into remote

Change-Id: Ifdeebe57508e82793d5bba4e783b52e92f5b6d19