commit 68f322ab62e1b6c66941f5b09a93dbe452c58ae5
author Nathan Harold <nharold@google.com> Fri Aug 10 22:13:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 10 22:13:40 2018 +0000
tree 222863699da4720192d2f7bd8c62ce147950355e
parent 63d3dfc2c702c0f8195d001ecf74603d8ab8632e
parent 54a07f9d19d4e89d7e19fa941a9da236bd2eabf4

Merge "Use P SDK Constant To Check NeighboringCell"

res/layout/pref_dialog_editphonenumber.xml

diff --git a/res/layout/pref_dialog_editphonenumber.xml b/res/layout/pref_dialog_editphonenumber.xml
index cb16516..3bd52c0 100644
--- a/res/layout/pref_dialog_editphonenumber.xml
+++ b/res/layout/pref_dialog_editphonenumber.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:padding="?android:attr/dialogPreferredPadding">
 
-    <TextView android:id="@+android:id/message"
+    <TextView android:id="@+id/message"
         style="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

res/layout/telephony_disallowed_preference_screen.xml

diff --git a/res/layout/telephony_disallowed_preference_screen.xml b/res/layout/telephony_disallowed_preference_screen.xml
index 18b4d94..baa049f 100644
--- a/res/layout/telephony_disallowed_preference_screen.xml
+++ b/res/layout/telephony_disallowed_preference_screen.xml
@@ -30,7 +30,7 @@
                 android:cacheColorHint="@android:color/white"
                 android:fadingEdgeLength="16dip" />
 
-        <TextView android:id="@+android:id/empty"
+        <TextView android:id="@+id/empty"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"