OSDN Git Service

Merge "libblkid: fix buffer overflow scanning partition name" am: 0474c47c22
authorJin Qian <jinqian@google.com>
Mon, 24 Apr 2017 18:51:19 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 18:51:19 +0000 (18:51 +0000)
am: ff35b76641

Change-Id: I16fc2fe2ad37cec0fb7c20376d6bc285c0020eff


Trivial merge