summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tamas Berghammer <tberghammer@google.com> 2017-01-18 19:59:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-01-18 19:59:59 +0000
commita553354e84f75ae256b71e6b6b3e96d85dd954f7 (patch)
tree9f341e7a5577d6971aca0a9eca4dd32be71326c2
parentb4050d80427afe56fea20868f6b93a66d6c8d98b (diff)
parenta0a908f5d6cb040c74ed5dd32d715e2f686f9880 (diff)
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
index 967c922a36d3..9904c6ee438e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
@@ -28,7 +28,7 @@ import android.provider.Settings;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;