tree 24095db68c60907c4028f288ccc376ab2de4e5ae
parent a16ab279cff68829d74cdaf6a4c12a86934fe250
parent 5e9309097106a0616afc57a62e8c9b95fcf7851f
author Venkata Subbareddy Buvvana <venkatasubbareddy@codeaurora.org> 1481288545 +0530
committer Venkata Subbareddy Buvvana <venkatasubbareddy@codeaurora.org> 1481545925 +0530

N-MR1 upgrade back merge to dev branch.

Change-Id: I97da8f62b135f55dd358d6aaf12983b7b0a39a33