From: Malcolm Chen <refuhoo@google.com>
Date: Wed, 29 Nov 2017 00:36:54 +0000 (+0000)
Subject: Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d
X-Git-Tag: android-x86-9.0-r1~93^2~1^2~48
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=68af33f2df;p=android-x86%2Fpackages-apps-Settings.git

Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d
am: 9d30592308

Change-Id: I2b4480c0d1a98ce4bb87d6fa30f347b929703fe9
---

68af33f2dfffc173806c63651da67a1096f7ecd4