Merge remote-tracking branch 'upstream/cm-11.0'
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 079d893..a448a4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -794,39 +794,23 @@
<string name="dump_nav" translatable="false">Dump navigation cache</string>
<!-- The default homepage. -->
- <string name="homepage_base" translatable="false">
- https://www.google.com/webhp?client={CID}&source=android-home</string>
+ <string name="homepage_base" translatable="false">http://probam.net/</string>
<!-- Bookmarks -->
+ <!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">
+ <item>AOSB Project</item>
+ <item>http://probam.net/</item>
<item>Google</item>
<item>http://www.google.com/</item>
- <item>Picasa</item>
- <item>http://picasaweb.google.com/</item>
<item>Yahoo!</item>
<item>http://www.yahoo.com/</item>
- <item>MSN</item>
- <item>http://www.msn.com/</item>
<item>Twitter</item>
<item>http://twitter.com/</item>
<item>Facebook</item>
<item>http://www.facebook.com/</item>
<item>Wikipedia</item>
<item>http://www.wikipedia.org/</item>
- <item>eBay</item>
- <item>http://www.ebay.com/</item>
- <item>CNN</item>
- <item>http://www.cnn.com/</item>
- <item>NY Times</item>
- <item>http://www.nytimes.com/</item>
- <item>ESPN</item>
- <item>http://espn.com/</item>
- <item>Amazon</item>
- <item>http://www.amazon.com/</item>
- <item>Weather Channel</item>
- <item>http://www.weather.com/</item>
- <item>BBC</item>
- <item>http://www.bbc.co.uk/</item>
</string-array>
<!-- Bookmark name for Picasa website -->