From: Mitchell Wills <mwills@google.com>
Date: Wed, 31 Aug 2016 01:43:48 +0000 (+0000)
Subject: Merge commit 'cb8b5af' into nyc-dev-plus-aosp am: 3587c22e55
X-Git-Tag: android-x86-8.1-r1~285
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba38e9b25c0a6405d056b0ff9d6c3eaa9be02c03;p=android-x86%2Fsystem-extras.git

Merge commit 'cb8b5af' into nyc-dev-plus-aosp am: 3587c22e55
am: 4c900f9988

Change-Id: Iedad009e2a2b77cfe90011cab58e3ff198706a07
---

ba38e9b25c0a6405d056b0ff9d6c3eaa9be02c03