Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev

2013-09-03 23:48:34 +00:00
parent b3cd38eab4 c26807f20b
commit 58db341851
2 changed files with 44 additions and 12 deletions
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -17,6 +17,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <ImageView
+        android:id="@+id/regulatoryInfo"
        android:adjustViewBounds="true"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"