tree e34327424222e5686d92388b13091d4385bd44bf
parent 97aab1d554ff71b8f6887d1e2579c2bb230a9e34
parent 3b18d74935e32ea23b7265fd88f3f182d481eab5
author Alistair Strachan <astrachan@google.com> 1546555825 -0800
committer android-build-merger <android-build-merger@google.com> 1546555825 -0800

Merge "hikey960: use /dev/block/by-name/ for userdata mountpoint" am: 1ad3635624 am: 9e802373d7
am: 3b18d74935

Change-Id: I993993458231fc332681134b8800481f0ba3d033