merge heads

2012-03-20 10:23:19 -07:00
parent 1893c3557d
commit 08a17a58ef
21 changed files with 640 additions and 377 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>