tree e34327424222e5686d92388b13091d4385bd44bf
parent e416ead2dce4c10db3aa9be8b31e4a4f2d390947
parent 9e802373d731e4c77753c98ae3aa317a81da46da
author Alistair Strachan <astrachan@google.com> 1546555340 -0800
committer android-build-merger <android-build-merger@google.com> 1546555340 -0800

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

Change-Id: I81da678adcb1564be3a67fce2a85b3829ec09187