From: Jin Qian <jinqian@google.com>
Date: Mon, 24 Apr 2017 18:51:19 +0000 (+0000)
Subject: Merge "libblkid: fix buffer overflow scanning partition name" am: 0474c47c22
X-Git-Tag: android-x86-8.1-r1~20^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82452d8df89b7f07f59d9a18692acf39eb20c75d;p=android-x86%2Fexternal-e2fsprogs.git

Merge "libblkid: fix buffer overflow scanning partition name" am: 0474c47c22
am: ff35b76641

Change-Id: I16fc2fe2ad37cec0fb7c20376d6bc285c0020eff
---

82452d8df89b7f07f59d9a18692acf39eb20c75d