OSDN Git Service

resolve merge conflicts of 1c5265be54d3 to android-4.4
authorTodd Kjos <tkjos@google.com>
Mon, 20 Mar 2017 15:55:18 +0000 (08:55 -0700)
committerTodd Kjos <tkjos@google.com>
Mon, 20 Mar 2017 15:57:38 +0000 (08:57 -0700)
commit77e4e5b8af91b28c8ae69b78422e835c9c1a17fe
tree070155798e1bb0bdc31c510c5e483283d62f1e09
parent83193f99f1be71d6a6095ef56437d0711031854b
parent28ec98bc2e4a175b60f45d505e715a33b93dd077
resolve merge conflicts of 1c5265be54d3 to android-4.4

Change-Id: Idd5f2956c09b193b2a6ba02410e90b52aa2284d7
fs/ext4/inode.c