tree 50ba47d3d4b9a1ccddecdc39ce85c83d5a984548
parent 483825d1025e93d68e62fb679b34e973bca6d0da
parent 9e1391df5f07a10df47dccad20998c8765bfb366
author Dmitry Shmidt <dimitrysh@google.com> 1516674498 +0000
committer android-build-merger <android-build-merger@google.com> 1516674498 +0000

Merge "hikey960: Allow userdata f2fs mount" am: 9a96ef189a
am: 9e1391df5f

Change-Id: If0e243a06d608c35c958d4963290ed49c049e983