OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d83a851 96c347a)
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)
Conflicts:
ext4_utils/ext4_crypt.cpp

Change-Id: I7e6ae2bc067b0979a4053691dfe77ed4344b4c39


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help