Enable Material theme for Android (part 4)

This is the 3rd (and hopefuly the last) follow up CL for r467.

Files listed in this CL are obsolete, and actually should have been removed in r467.

BUG=none
TEST=manually done with Nexus 5 / Android 5.0.1 (LRX22C)

git-svn-id: https://mozc.googlecode.com/svn/trunk@470 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_alphabet.png b/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_alphabet.png
deleted file mode 100644
index d273ff3..0000000
--- a/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_alphabet.png
+++ /dev/null
Binary files differ
diff --git a/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_hiragana.png b/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_hiragana.png
deleted file mode 100644
index 4231731..0000000
--- a/src/android/static_resources/resources_oss/res/drawable-mdpi/status_icon_image_hiragana.png
+++ /dev/null
Binary files differ
diff --git a/src/android/static_resources/resources_oss/res/drawable-xxhdpi/application_icon.png b/src/android/static_resources/resources_oss/res/drawable-xxhdpi/application_icon.png
deleted file mode 100644
index f3f3055..0000000
--- a/src/android/static_resources/resources_oss/res/drawable-xxhdpi/application_icon.png
+++ /dev/null
Binary files differ
diff --git a/src/android/static_resources/resources_oss/res/values-h400dp-land/config.xml b/src/android/static_resources/resources_oss/res/values-h400dp-land/config.xml
deleted file mode 100644
index ef022ef..0000000
--- a/src/android/static_resources/resources_oss/res/values-h400dp-land/config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <!-- Columns per screen in symbol input view (Emoticon). -->
-  <integer name="symbol_input_candidate_columns_emoticon">6</integer>
-  <!-- Columns per screen in symbol input view (Symbol). -->
-  <integer name="symbol_input_candidate_columns_symbol">8</integer>
-  <!-- Columns per screen in symbol input view (Emoji). -->
-  <integer name="symbol_input_candidate_columns_emoji">8</integer>
-  <!-- Rows per screen in symbol input view. -->
-  <integer name="symbol_input_candidate_rows">4</integer>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-h400dp-land/dimens.xml b/src/android/static_resources/resources_oss/res/values-h400dp-land/dimens.xml
deleted file mode 100644
index 63ac06a..0000000
--- a/src/android/static_resources/resources_oss/res/values-h400dp-land/dimens.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <dimen name="ime_window_height">328.4dip</dimen>
-  <dimen name="input_frame_height">240dip</dimen>
-  <!-- input_frame_height_width_shadow should be input_drame_height + translucent_border_height -->
-  <dimen name="input_frame_height_with_shadow">243.4dip</dimen>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-ja-land/strings.xml b/src/android/static_resources/resources_oss/res/values-ja-land/strings.xml
deleted file mode 100644
index 4817757..0000000
--- a/src/android/static_resources/resources_oss/res/values-ja-land/strings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-    <string name="symbol_minor_symbol_history_title">履歴</string>
-    <string name="symbol_minor_symbol_general_title">一般/記号</string>
-    <string name="symbol_minor_symbol_half_title">半角/全角</string>
-    <string name="symbol_minor_symbol_parenthesis_title">括弧/罫線</string>
-    <string name="symbol_minor_symbol_arrow_title">矢印/数字</string>
-    <string name="symbol_minor_symbol_math_title">数式/単位</string>
-
-    <string name="symbol_minor_emoticon_history_title">履歴</string>
-    <string name="symbol_minor_emoticon_smile_title">喜 (^^)</string>
-    <string name="symbol_minor_emoticon_sweat_title">焦 (^^;)</string>
-    <string name="symbol_minor_emoticon_surprise_title">驚 (゜д゜)</string>
-    <string name="symbol_minor_emoticon_sadness_title">悲 (T_T)</string>
-    <string name="symbol_minor_emoticon_displeasure_title">怒 (-_-)</string>
-
-    <string name="symbol_minor_emoji_history_title">履歴</string>
-    <string name="symbol_minor_emoji_face_title">表情/感情</string>
-    <string name="symbol_minor_emoji_food_title">食事/遊び</string>
-    <string name="symbol_minor_emoji_activity_title">行事/生活</string>
-    <string name="symbol_minor_emoji_city_title">街/仕事</string>
-    <string name="symbol_minor_emoji_nature_title">自然/図形</string>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-ja-v11/strings.xml b/src/android/static_resources/resources_oss/res/values-ja-v11/strings.xml
deleted file mode 100644
index c5fd3c2..0000000
--- a/src/android/static_resources/resources_oss/res/values-ja-v11/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-    <string name="pref_fragment_software_keyboard_title">ソフトウェアキーボード</string>
-    <string name="pref_fragment_input_support_title">入力サポート</string>
-    <string name="pref_fragment_conversion_title">変換</string>
-    <string name="pref_fragment_dictionary_title">辞書</string>
-    <string name="pref_fragment_user_feedback_title">ユーザフィードバック</string>
-    <string name="pref_fragment_about_title">概要</string>
-    <string name="pref_fragment_development_title">開発</string>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-v11/strings.xml b/src/android/static_resources/resources_oss/res/values-v11/strings.xml
deleted file mode 100644
index 4377813..0000000
--- a/src/android/static_resources/resources_oss/res/values-v11/strings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-    <!-- Titles for the preference headers. -->
-    <string name="pref_fragment_software_keyboard_title">Software keyboard</string>
-    <string name="pref_fragment_input_support_title">Input support</string>
-    <string name="pref_fragment_conversion_title">Conversion</string>
-    <string name="pref_fragment_dictionary_title">Dictionary</string>
-    <string name="pref_fragment_user_feedback_title">User feedback</string>
-    <string name="pref_fragment_about_title">About</string>
-    <string name="pref_fragment_development_title">Development</string>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-v11/styles.xml b/src/android/static_resources/resources_oss/res/values-v11/styles.xml
deleted file mode 100644
index 1152791..0000000
--- a/src/android/static_resources/resources_oss/res/values-v11/styles.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <!-- Use Holo.Light theme for devices which is Android 3.0 or later. -->
-  <style name="MozcDialogTextView" parent="@android:style/Widget.Holo.Light.TextView" />
-  <style name="MozcLightTheme" parent="@android:style/Theme.Holo.Light" />
-
-  <!-- Theme for mushroom dialog. -->
-  <style name="MozcMushroomDialogTheme" parent="@android:style/Theme.Holo.Light.Dialog" />
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-xlarge-land/dimens.xml b/src/android/static_resources/resources_oss/res/values-xlarge-land/dimens.xml
deleted file mode 100644
index 23adc4b..0000000
--- a/src/android/static_resources/resources_oss/res/values-xlarge-land/dimens.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <dimen name="input_frame_height">285.4dip</dimen>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-xlarge/config.xml b/src/android/static_resources/resources_oss/res/values-xlarge/config.xml
deleted file mode 100644
index 8da9d13..0000000
--- a/src/android/static_resources/resources_oss/res/values-xlarge/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <!-- Candidate window scroll animation : Velocity decay rate in ppm -->
-  <integer name="candidate_scroller_velocity_decay_rate">696845</integer>
-  <!-- Columns per screen in symbol input view (Emoticon). -->
-  <integer name="symbol_input_candidate_columns_emoticon">6</integer>
-  <!-- Columns per screen in symbol input view (Symbol). -->
-  <integer name="symbol_input_candidate_columns_symbol">8</integer>
-  <!-- Columns per screen in symbol input view (Emoji). -->
-  <integer name="symbol_input_candidate_columns_emoji">8</integer>
-  <!-- Rows per screen in symbol input view. -->
-  <integer name="symbol_input_candidate_rows">4</integer>
-</resources>
diff --git a/src/android/static_resources/resources_oss/res/values-xlarge/dimens.xml b/src/android/static_resources/resources_oss/res/values-xlarge/dimens.xml
deleted file mode 100644
index b322f95..0000000
--- a/src/android/static_resources/resources_oss/res/values-xlarge/dimens.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2010-2014, Google Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-  <dimen name="pref_inputstyle_description_width">150dip</dimen>
-
-  <dimen name="candidate_text_size">32dip</dimen>
-  <dimen name="candidate_description_text_size">12dip</dimen>
-  <dimen name="candidate_text_size_aligned_layout">20dip</dimen>
-  <dimen name="candidate_description_text_size_aligned_layout">10dip</dimen>
-
-  <dimen name="symbol_view_scroll_guide_width_per_page">70dip</dimen>
-  <dimen name="symbol_view_minor_category_height">79.5dip</dimen>
-  <dimen name="symbol_view_major_category_height">79.5dip</dimen>
-
-  <dimen name="ime_window_height_portrait">@dimen/ime_window_height_portrait_xlarge</dimen>
-  <dimen name="ime_window_height_landscape">@dimen/ime_window_height_landscape_xlarge</dimen>
-  <dimen name="input_frame_height">325.4dip</dimen>
-
-  <dimen name="firsttime_app_name_text_size">32dip</dimen>
-  <dimen name="firsttime_description_text_size">25dip</dimen>
-  <dimen name="firsttime_padding_height">28dip</dimen>
-  <dimen name="firsttime_padding_width">40dip</dimen>
-
-  <!-- 3.5 Rows of candidates -->
-  <!-- (candidate_text_size + candidate_vertical_padding_size * 2) * 3.5
-       + narrow_frame_height -->
-  <dimen name="narrow_ime_window_height">205dip</dimen>
-</resources>
diff --git a/src/android/static_resources/resources_oss/src/DONT_REMOVE_THIS_DIRECTORY b/src/android/static_resources/resources_oss/src/DONT_REMOVE_THIS_DIRECTORY
deleted file mode 100644
index e69de29..0000000
--- a/src/android/static_resources/resources_oss/src/DONT_REMOVE_THIS_DIRECTORY
+++ /dev/null
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 610717a..66bf4ce 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2006
+BUILD=2007
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.