From e31036100d6d32138485f396d997951dd33fa43c Mon Sep 17 00:00:00 2001 From: karthik bharadwaj Date: Thu, 25 Jun 2020 11:22:41 -0700 Subject: [PATCH] Remove a newline to prevent a merge conflict Upstream AOSP change doesn't have a newline at the location this change addresses, causing a merge conflict Test: Build, presubmit Bug: 159464174 Merged-In: I957dfe35aacc3e397611d8ab0b9ad19a1130a3dd Change-Id: I7614d420ad55129b04e0dfa9310e39d715ed2da7 --- core/java/android/hardware/GeomagneticField.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/java/android/hardware/GeomagneticField.java b/core/java/android/hardware/GeomagneticField.java index bf811279fb1b8..cbfe4fa58e403 100644 --- a/core/java/android/hardware/GeomagneticField.java +++ b/core/java/android/hardware/GeomagneticField.java @@ -50,7 +50,6 @@ public class GeomagneticField { // These coefficients and the formulae used below are from: // NOAA Technical Report: The US/UK World Magnetic Model for 2020-2025 - static private final float[][] G_COEFF = new float[][]{ {0.0f}, {-29404.5f, -1450.7f},