diff --git a/emailcommon/src/com/android/emailcommon/provider/Policy.java b/emailcommon/src/com/android/emailcommon/provider/Policy.java
index 3df6d2b2c..76b223dfd 100755
--- a/emailcommon/src/com/android/emailcommon/provider/Policy.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Policy.java
@@ -444,10 +444,12 @@ public final class Policy extends EmailContent implements EmailContent.PolicyCol
      * Supports Parcelable
      */
     public static final Parcelable.Creator<Policy> CREATOR = new Parcelable.Creator<Policy>() {
+        @Override
         public Policy createFromParcel(Parcel in) {
             return new Policy(in);
         }
 
+        @Override
         public Policy[] newArray(int size) {
             return new Policy[size];
         }
diff --git a/emailcommon/src/com/android/emailcommon/provider/QuickResponse.java b/emailcommon/src/com/android/emailcommon/provider/QuickResponse.java
index 3df082442..63b3d3184 100644
--- a/emailcommon/src/com/android/emailcommon/provider/QuickResponse.java
+++ b/emailcommon/src/com/android/emailcommon/provider/QuickResponse.java
@@ -192,6 +192,7 @@ public final class QuickResponse extends EmailContent
     /**
      * Implements Parcelable.
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         // mBaseUri is not parceled
         dest.writeLong(mId);
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java
index 624745577..b7a59b81d 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java
+++ b/emailcommon/src/com/android/emailcommon/utility/SSLSocketFactory.java
@@ -269,6 +269,7 @@ public class SSLSocketFactory implements LayeredSocketFactory {
 
 
     // non-javadoc, see interface org.apache.http.conn.SocketFactory
+    @Override
     public Socket createSocket()
         throws IOException {
 
@@ -278,6 +279,7 @@ public class SSLSocketFactory implements LayeredSocketFactory {
 
 
     // non-javadoc, see interface org.apache.http.conn.SocketFactory
+    @Override
     public Socket connectSocket(
         final Socket sock,
         final String host,
@@ -348,6 +350,7 @@ public class SSLSocketFactory implements LayeredSocketFactory {
      *
      * @throws IllegalArgumentException if the argument is invalid
      */
+    @Override
     public boolean isSecure(Socket sock)
         throws IllegalArgumentException {
 
@@ -370,6 +373,7 @@ public class SSLSocketFactory implements LayeredSocketFactory {
 
 
     // non-javadoc, see interface LayeredSocketFactory
+    @Override
     public Socket createSocket(
         final Socket socket,
         final String host,