OSDN Git Service

Merge commit '96c347a9b99d0c5a22d76a5661489a4b7623d183' into remote
authorLalit Kansara <lkansara@codeaurora.org>
Tue, 6 Dec 2016 09:42:39 +0000 (15:12 +0530)
committerLalit Kansara <lkansara@codeaurora.org>
Tue, 6 Dec 2016 09:42:39 +0000 (15:12 +0530)
commit630629664ebd89e18eb7870c7f1014a495d9598d
tree19e69b2b19f7cc6b778d5e85eb18b6eb3503d3fa
parentd83a851b136575e235a5727aedfec7d5f2a86ce3
parent96c347a9b99d0c5a22d76a5661489a4b7623d183
Merge commit '96c347a9b99d0c5a22d76a5661489a4b7623d183' into remote

Conflicts:
ext4_utils/ext4_crypt.cpp

Change-Id: I7e6ae2bc067b0979a4053691dfe77ed4344b4c39