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)
Change-Id: Idd5f2956c09b193b2a6ba02410e90b52aa2284d7

1  2 
fs/ext4/inode.c

diff --cc fs/ext4/inode.c
Simple merge