From: Alex Light <allight@google.com>
Date: Fri, 16 Dec 2016 22:37:45 +0000 (+0000)
Subject: merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3
X-Git-Tag: android-x86-8.1-r1~68^2~48^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93f8319bc77fabff2810f2d57aa285b091ed5d05;p=android-x86%2Fsystem-extras.git

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3
am: c51d68746c

Change-Id: I28727204b16e0cb6c45a2ab3305fb2913278975c
---

93f8319bc77fabff2810f2d57aa285b091ed5d05