am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev

* commit 'c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
  Show regulatory info within a ScrollView
This commit is contained in:
Brian Muramatsu
2012-10-17 21:53:36 -07:00
committed by Android Git Automerger

View File

@@ -13,9 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:adjustViewBounds="true"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:src="@drawable/regulatory_info"/>
android:layout_height="wrap_content">
<ImageView
android:adjustViewBounds="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:src="@drawable/regulatory_info" />
</ScrollView>