From: Andy Spencer Date: Fri, 7 Mar 2014 07:10:15 +0000 (+0000) Subject: Merge changes from Yue X-Git-Url: http://pileus.org/git/?p=~andy%2FiBeaconNav;a=commitdiff_plain;h=1ac485ec0eff95b11ba80a3c98b8ddfd9c5be56f Merge changes from Yue --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f0b15b..786e5c9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,7 +19,7 @@ android:glEsVersion="0x00020000" android:required="true"/> @@ -33,6 +33,7 @@ + - + android:layout_height="wrap_content" + android:columnCount="1" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +