From: Fan Zhang Date: Fri, 11 May 2018 06:04:02 +0000 (-0700) Subject: [automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=446b699fc3e38aab9baa8028f5dfeaf38df09bac;p=android-x86%2Fpackages-apps-Settings.git [automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am: 9e629edb09 am: b76c1ba682 -s ours Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31 --- 446b699fc3e38aab9baa8028f5dfeaf38df09bac