merge heads

2012-03-19 14:26:13 -07:00
parent d8a81e00cf 51a565b49f
commit 963bbedea5
20 changed files with 639 additions and 376 deletions
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <style name="ThemeSelector" parent="android:Theme" />
+
  <!--  About page label -->
  <style name="AboutLabel">
    <item name="android:layout_height">wrap_content</item>