am 1cbb5396: am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"

* commit '1cbb539668cd5c16d3c428d6b1b91d7f3b4e9f72':
  Wrong referring to the resource - id/android:id
This commit is contained in:
Amith Yamasani
2013-12-04 21:14:43 +00:00
committed by Android Git Automerger

View File

@@ -19,7 +19,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingEnd="?android:attr/scrollbarSize">
<com.android.settings.applications.LinearColorBar
android:id="@+android:id/linear_color_bar"
android:id="@+id/linear_color_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="16dp"