Merge heads

This commit is contained in:
youtaol
2012-07-06 14:41:50 +08:00
parent 9a24f12e11
commit 812ca57d42
180 changed files with 1201 additions and 737 deletions
+2 -1
View File
@@ -18,7 +18,8 @@ limitations under the License.
android:title="@string/settings_sharing" >
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/default_map_public_key" />
android:key="@string/default_map_public_key"
android:title="@string/settings_sharing_new_map_public" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/allow_access_key"