From: Alex Deymo <deymo@google.com>
Date: Thu, 12 Jan 2017 21:41:21 +0000 (+0000)
Subject: Merge changes from topic 'host_suffix_cleanup' am: 28eb980da9 am: e745604fb8
X-Git-Tag: android-x86-8.1-r1~68^2~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=edc1ed785f;p=android-x86%2Fsystem-extras.git

Merge changes from topic 'host_suffix_cleanup' am: 28eb980da9 am: e745604fb8
am: a5c32df454

Change-Id: I21cb2a39503b42ae781c29a1eb2d5249b9e684a4
---

edc1ed785fc9f31bd77d42ab26576c8a7dbeff01