From: Jeff Sharkey Date: Wed, 31 May 2017 15:07:18 +0000 (+0000) Subject: Merge "Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit" X-Git-Tag: android-x86-9.0-r1~950 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=63b013ea602e98edc8fb1b05795dd548b9f73051;p=android-x86%2Fpackages-apps-Settings.git Merge "Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit" --- 63b013ea602e98edc8fb1b05795dd548b9f73051