diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk
index 9217018..a8453c1 100644
--- a/apps/SampleEmailPolicy/Android.mk
+++ b/apps/SampleEmailPolicy/Android.mk
@@ -28,6 +28,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := SampleEmailPolicy
+LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 2e76f5b..b7c836f 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -751,6 +751,14 @@
       type="mms"
   />
 
+  <apn carrier="Truphone"
+      mcc="204"
+      mnc="33"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+  />
+
   <apn carrier="Px MMS"
       mcc="206"
       mnc="01"
@@ -1029,6 +1037,13 @@
       type="mms"
   />
 
+  <apn carrier="BICS Internet"
+      mcc="206"
+      mnc="28"
+      apn="bicsapn"
+      type="default,supl"
+  />
+
   <apn carrier="Orange World"
       mcc="208"
       mnc="01"
@@ -1522,7 +1537,8 @@
       mcc="208"
       mnc="15"
       apn="free"
-      type="default,supl"
+      mmsc="http://mms.free.fr"
+      type="default,supl,mms"
   />
 
   <apn carrier="Free MMS"
@@ -1533,6 +1549,26 @@
       type="mms"
   />
 
+  <apn carrier="Free Re Int"
+      mcc="208"
+      mnc="15"
+      apn="free.re"
+      mmsc="http://mms.free.re"
+      type="default,supl,mms"
+      mvno_match_data="F2330002"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Iliad Int"
+      mcc="208"
+      mnc="15"
+      apn="iliad"
+      mmsc="http://mms.iliad-italia.it"
+      type="default,supl,mms"
+      mvno_match_data="F003"
+      mvno_type="gid"
+  />
+
   <apn carrier="Legos"
       mcc="208"
       mnc="17"
@@ -1621,6 +1657,27 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Coriolis"
+      mcc="208"
+      mnc="27"
+      apn="coriolis"
+      type="default,supl"
+      mvno_match_data="Coriolis"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Coriolis MMS"
+      mcc="208"
+      mnc="27"
+      apn="mmscoriolis"
+      mmsc="http://mms.coriolis.fr"
+      mmsproxy="10.12.0.1"
+      mmsport="9028"
+      type="mms"
+      mvno_match_data="Coriolis"
+      mvno_type="spn"
+  />
+
 
   <apn carrier="Internet móvil"
       mcc="214"
@@ -2513,14 +2570,12 @@
       type="mms"
   />
 
-  <apn carrier="Telenor WAP"
+  <apn carrier="Telenor internet"
       mcc="220"
       mnc="01"
       apn="internet"
       user="telenor"
       password="gprs"
-      proxy="217.65.192.33"
-      port="8080"
       authtype="1"
       type="default,supl"
   />
@@ -2889,6 +2944,14 @@
       mvno_match_data="ERG"
   />
 
+  <apn carrier="Iliad"
+      mcc="222"
+      mnc="50"
+      apn="iliad"
+      mmsc="http://mms.iliad-italia.it"
+      type="default,supl,mms"
+  />
+
   <apn carrier="WIND WEB"
       mcc="222"
       mnc="88"
@@ -4101,6 +4164,30 @@
       type="default,supl,mms,dun"
   />
 
+  <apn carrier="Jump"
+      mcc="234"
+      mnc="39"
+      apn="Jump"
+      mmsc="http://mmsc.mobi/servlets/mms"
+      mmsproxy="164.39.236.69"
+      mmsport="80"
+      protocol="IP"
+      roaming_protocol="IP"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
+  <apn carrier="Gamma Data"
+      mcc="234"
+      mnc="39"
+      apn="gamma.co.uk"
+      mmsc="http://mms.gamma.co.uk/servlets/mms"
+      mmsproxy="164.39.236.69"
+      mmsport="80"
+      protocol="IP"
+      roaming_protocol="IP"
+  />
+
   <apn carrier="Jersey Telecom"
       mcc="234"
       mnc="50"
@@ -4120,6 +4207,16 @@
       type="default,supl"
   />
 
+  <apn carrier="Truphone"
+      mcc="234"
+      mnc="50"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+      mvno_match_data="234500008"
+      mvno_type="imsi"
+  />
+
   <apn carrier="C&amp;W Guernsey Internet"
       mcc="234"
       mnc="55"
@@ -4477,18 +4574,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="04"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-  />
-
   <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="05"
@@ -4573,23 +4658,19 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor Mobilsurf"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
-      type="default,supl"
+  <apn carrier="Internet"
+       mcc="240"
+       mnc="06"
+       apn="internet"
+       type="default,supl"
   />
 
-  <apn carrier="Telenor MMS"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
+  <apn carrier="MMS"
+       mcc="240"
+       mnc="06"
+       apn="mms"
+       mmsc="http://mms.media"
+       type="mms"
   />
 
   <apn carrier="Tele2 Internet"
@@ -4650,14 +4731,47 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="Telenor SE"
+  <apn carrier="Jump"
+      mcc="240"
+      mnc="07"
+      apn="Jump"
+      mmsc="http://mmsc.mobi/servlets/mms"
+      mmsproxy="164.39.236.69"
+      mmsport="80"
+      protocol="IP"
+      roaming_protocol="IP"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
+  <apn carrier="Gamma Data"
+      mcc="240"
+      mnc="07"
+      apn="gamma.co.uk"
+      mmsc="http://mms.gamma.co.uk/servlets/mms"
+      mmsproxy="164.39.236.69"
+      mmsport="80"
+      protocol="IP"
+      roaming_protocol="IP"
+      mvno_type="imsi"
+      mvno_match_data="24007561"
+  />
+
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
+      type="default,supl"
+  />
+
+  <apn carrier="Telenor MMS"
+      mcc="240"
+      mnc="08"
+      apn="mms"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="default,supl,mms"
+      type="mms"
   />
 
   <apn carrier="Com4"
@@ -4745,18 +4859,6 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="24"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-  />
-
   <apn carrier="Ventelo Internett"
       mcc="242"
       mnc="01"
@@ -6676,9 +6778,7 @@
       mcc="284"
       mnc="05"
       apn="telenorbg"
-      authtype="1"
-      proxy="192.168.88.11"
-      port="8004"
+      authtype="0"
       type="default,supl"
   />
 
@@ -24988,6 +25088,18 @@
       authtype="2"
   />
 
+  <apn carrier="RATEL"
+       mcc="440"
+       mnc="10"
+       apn="ratel.com"
+       user="ratel@ratel.com"
+       server=""
+       password="ratel"
+       authtype="3"
+       protocol="IPV4V6"
+       type="default,supl"
+  />
+
   <apn carrier="SBM"
       mcc="440"
       mnc="20"
@@ -25017,6 +25129,30 @@
       authtype="2"
   />
 
+  <apn carrier="RATEL"
+       mcc="440"
+       mnc="20"
+       apn="ratel.com"
+       user="ratel@ratel.com"
+       server=""
+       password="ratel"
+       authtype="3"
+       protocol="IPV4V6"
+       type="default,supl"
+  />
+
+  <apn carrier="RATEL"
+       mcc="440"
+       mnc="51"
+       apn="ratel.com"
+       user="ratel@ratel.com"
+       server=""
+       password="ratel"
+       authtype="3"
+       protocol="IPV4V6"
+       type="default,supl"
+  />
+
   <apn carrier="SKT IA"
       mcc="450"
       mnc="05"
@@ -29253,6 +29389,14 @@
       type="mms"
   />
 
+  <apn carrier="Free Re"
+      mcc="647"
+      mnc="03"
+      apn="free.re"
+      mmsc="http://mms.free.re"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Full Internet SRR"
       mcc="647"
       mnc="10"
@@ -30101,10 +30245,10 @@
       type="mms"
   />
 
-  <apn carrier="Internet Fulmovil"
+  <apn carrier="Internet Fullmovil"
       mcc="712"
       mnc="20"
-      apn="datos.fulmovil.cr"
+      apn="datos.fullmovil.cr"
       type="default,supl"
   />
 
@@ -32037,6 +32181,15 @@
       type="default"
   />
 
+  <apn carrier="CIOT Vodafone"
+      mcc="901"
+      mnc="28"
+      apn="ciot.vodafone.com"
+      user="vodafone"
+      password="vodafone"
+      type="default"
+  />
+
   <apn carrier="mobiledata"
       mcc="901"
       mnc="37"
@@ -32050,4 +32203,46 @@
       apn="em"
       type="default"
   />
+
+  <apn carrier="BICS Internet"
+      mcc="901"
+      mnc="58"
+      apn="bicsapn"
+      type="default,supl"
+  />
+
+  <apn carrier="Sberbank-Telecom Internet"
+      mcc="250"
+      mnc="050"
+      apn="internet.sberbank-tele.com"
+      user=""
+      password=""
+      type="default,supl"
+  />
+  <apn carrier="Sberbank-Telecom MMS"
+      mcc="250"
+      mnc="050"
+      apn="mms.sberbank-tele.com"
+      user=""
+      password=""
+      mmsc="http://mmsc"
+      mmsproxy="10.77.36.100"
+      mmsport="8080"
+      type="mms"
+  />
+  <apn carrier="Sberbank-Telecom IMS"
+      mcc="250"
+      mnc="050"
+      apn="ims.sberbank-tele.com"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Unleashed"
+      mcc="206"
+      mnc="30"
+      apn="web.be"
+      type="default,supl"
+  />
+
 </apns>
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
index 93c3472..f34a5ef 100644
--- a/frameworks/PlatformLibrary/Android.mk
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -33,6 +33,7 @@
 
 # This is the target being built.
 LOCAL_MODULE:= com.example.android.platform_library
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_JAVA_LIBRARY)
 
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk
index d19b6cc..2b91f05 100644
--- a/frameworks/PlatformLibrary/jni/Android.mk
+++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -43,7 +43,6 @@
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE)
 
-# No specia compiler flags.
-LOCAL_CFLAGS +=
+LOCAL_CFLAGS += -Wall -Werror
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
index 428d0a8..b03c385 100644
--- a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
+++ b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
@@ -250,7 +250,7 @@
 /*
  * This is called by the VM when the shared library is first loaded.
  */
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
     JNIEnv* env = NULL;
     jint result = -1;