Add missing @Override annotations in support library code.

Change-Id: Ifcc3a20b54d6a14b0a14aa0f48e642cf7e8c0e70
diff --git a/compat/java/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.java b/compat/java/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.java
index 3de3631..e9b50a0 100644
--- a/compat/java/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.java
+++ b/compat/java/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.java
@@ -39,26 +39,32 @@
 
     static class AccessibilityServiceInfoStubImpl implements AccessibilityServiceInfoVersionImpl {
 
+        @Override
         public boolean getCanRetrieveWindowContent(AccessibilityServiceInfo info) {
             return false;
         }
 
+        @Override
         public String getDescription(AccessibilityServiceInfo info) {
             return null;
         }
 
+        @Override
         public String getId(AccessibilityServiceInfo info) {
             return null;
         }
 
+        @Override
         public ResolveInfo getResolveInfo(AccessibilityServiceInfo info) {
             return null;
         }
 
+        @Override
         public String getSettingsActivityName(AccessibilityServiceInfo info) {
             return null;
         }
 
+        @Override
         public int getCapabilities(AccessibilityServiceInfo info) {
             return 0;
         }
diff --git a/compat/java/android/support/v4/app/RemoteInput.java b/compat/java/android/support/v4/app/RemoteInput.java
index eb389d6..99b018d 100644
--- a/compat/java/android/support/v4/app/RemoteInput.java
+++ b/compat/java/android/support/v4/app/RemoteInput.java
@@ -53,6 +53,7 @@
      * Get the key that the result of this input will be set in from the Bundle returned by
      * {@link #getResultsFromIntent} when the {@link android.app.PendingIntent} is sent.
      */
+    @Override
     public String getResultKey() {
         return mResultKey;
     }
@@ -60,6 +61,7 @@
     /**
      * Get the label to display to users when collecting this input.
      */
+    @Override
     public CharSequence getLabel() {
         return mLabel;
     }
@@ -67,6 +69,7 @@
     /**
      * Get possible input choices. This can be {@code null} if there are no choices to present.
      */
+    @Override
     public CharSequence[] getChoices() {
         return mChoices;
     }
@@ -77,6 +80,7 @@
      * choices in {@link #getChoices}. An {@link IllegalArgumentException} is thrown
      * if you set this to false and {@link #getChoices} returns {@code null} or empty.
      */
+    @Override
     public boolean getAllowFreeFormInput() {
         return mAllowFreeFormInput;
     }
@@ -84,6 +88,7 @@
     /**
      * Get additional metadata carried around with this remote input.
      */
+    @Override
     public Bundle getExtras() {
         return mExtras;
     }
diff --git a/compat/java/android/support/v4/app/ShareCompat.java b/compat/java/android/support/v4/app/ShareCompat.java
index caa2a13..27dc48f 100644
--- a/compat/java/android/support/v4/app/ShareCompat.java
+++ b/compat/java/android/support/v4/app/ShareCompat.java
@@ -84,10 +84,12 @@
     }
 
     static class ShareCompatImplBase implements ShareCompatImpl {
+        @Override
         public void configureMenuItem(MenuItem item, IntentBuilder shareIntent) {
             item.setIntent(shareIntent.createChooserIntent());
         }
 
+        @Override
         public String escapeHtml(CharSequence text) {
             StringBuilder out = new StringBuilder();
             withinStyle(out, text, 0, text.length());
@@ -122,6 +124,7 @@
     }
 
     static class ShareCompatImplICS extends ShareCompatImplBase {
+        @Override
         public void configureMenuItem(MenuItem item, IntentBuilder shareIntent) {
             ShareCompatICS.configureMenuItem(item, shareIntent.getActivity(),
                     shareIntent.getIntent());
@@ -136,6 +139,7 @@
     }
 
     static class ShareCompatImplJB extends ShareCompatImplICS {
+        @Override
         public String escapeHtml(CharSequence html) {
             return ShareCompatJB.escapeHtml(html);
         }
diff --git a/compat/java/android/support/v4/content/ModernAsyncTask.java b/compat/java/android/support/v4/content/ModernAsyncTask.java
index 7f9201d..7d9f0c3 100644
--- a/compat/java/android/support/v4/content/ModernAsyncTask.java
+++ b/compat/java/android/support/v4/content/ModernAsyncTask.java
@@ -55,6 +55,7 @@
     private static final ThreadFactory sThreadFactory = new ThreadFactory() {
         private final AtomicInteger mCount = new AtomicInteger(1);
 
+        @Override
         public Thread newThread(Runnable r) {
             return new Thread(r, "ModernAsyncTask #" + mCount.getAndIncrement());
         }
@@ -121,6 +122,7 @@
      */
     public ModernAsyncTask() {
         mWorker = new WorkerRunnable<Params, Result>() {
+            @Override
             public Result call() throws Exception {
                 mTaskInvoked.set(true);
 
diff --git a/compat/java/android/support/v4/os/ResultReceiver.java b/compat/java/android/support/v4/os/ResultReceiver.java
index f34d43d..ce66dc6 100644
--- a/compat/java/android/support/v4/os/ResultReceiver.java
+++ b/compat/java/android/support/v4/os/ResultReceiver.java
@@ -52,12 +52,14 @@
             mResultData = resultData;
         }
         
+        @Override
         public void run() {
             onReceiveResult(mResultCode, mResultData);
         }
     }
     
     class MyResultReceiver extends IResultReceiver.Stub {
+        @Override
         public void send(int resultCode, Bundle resultData) {
             if (mHandler != null) {
                 mHandler.post(new MyRunnable(resultCode, resultData));
@@ -112,10 +114,12 @@
     protected void onReceiveResult(int resultCode, Bundle resultData) {
     }
     
+    @Override
     public int describeContents() {
         return 0;
     }
 
+    @Override
     public void writeToParcel(Parcel out, int flags) {
         synchronized (this) {
             if (mReceiver == null) {
@@ -133,9 +137,11 @@
     
     public static final Creator<ResultReceiver> CREATOR
             = new Creator<ResultReceiver>() {
+        @Override
         public ResultReceiver createFromParcel(Parcel in) {
             return new ResultReceiver(in);
         }
+        @Override
         public ResultReceiver[] newArray(int size) {
             return new ResultReceiver[size];
         }
diff --git a/compat/java/android/support/v4/text/TextUtilsCompat.java b/compat/java/android/support/v4/text/TextUtilsCompat.java
index c8207e4..40bc298 100644
--- a/compat/java/android/support/v4/text/TextUtilsCompat.java
+++ b/compat/java/android/support/v4/text/TextUtilsCompat.java
@@ -98,6 +98,7 @@
     }
 
     private static class TextUtilsCompatJellybeanMr1Impl extends TextUtilsCompatImpl {
+        @Override
         @NonNull
         public String htmlEncode(@NonNull String s) {
             return TextUtilsCompatJellybeanMr1.htmlEncode(s);
diff --git a/compat/java/android/support/v4/text/util/LinkifyCompat.java b/compat/java/android/support/v4/text/util/LinkifyCompat.java
index 7fc4af3..3894f6b 100644
--- a/compat/java/android/support/v4/text/util/LinkifyCompat.java
+++ b/compat/java/android/support/v4/text/util/LinkifyCompat.java
@@ -51,6 +51,7 @@
     private static final String[] EMPTY_STRING = new String[0];
 
     private static final Comparator<LinkSpec>  COMPARATOR = new Comparator<LinkSpec>() {
+        @Override
         public final int compare(LinkSpec a, LinkSpec b) {
             if (a.start < b.start) {
                 return -1;
diff --git a/compat/java/android/support/v4/view/AccessibilityDelegateCompat.java b/compat/java/android/support/v4/view/AccessibilityDelegateCompat.java
index 4d0281e..920b6e5 100644
--- a/compat/java/android/support/v4/view/AccessibilityDelegateCompat.java
+++ b/compat/java/android/support/v4/view/AccessibilityDelegateCompat.java
@@ -65,6 +65,7 @@
     }
 
     static class AccessibilityDelegateStubImpl implements AccessibilityDelegateImpl {
+        @Override
         public Object newAccessiblityDelegateDefaultImpl() {
             return null;
         }
diff --git a/compat/java/android/support/v4/view/GestureDetectorCompat.java b/compat/java/android/support/v4/view/GestureDetectorCompat.java
index 055812c..aaed921 100644
--- a/compat/java/android/support/v4/view/GestureDetectorCompat.java
+++ b/compat/java/android/support/v4/view/GestureDetectorCompat.java
@@ -188,6 +188,7 @@
          * @param onDoubleTapListener the listener invoked for all the callbacks, or
          *        null to stop listening for double-tap gestures.
          */
+        @Override
         public void setOnDoubleTapListener(OnDoubleTapListener onDoubleTapListener) {
             mDoubleTapListener = onDoubleTapListener;
         }
@@ -201,6 +202,7 @@
          *
          * @param isLongpressEnabled whether longpress should be enabled.
          */
+        @Override
         public void setIsLongpressEnabled(boolean isLongpressEnabled) {
             mIsLongpressEnabled = isLongpressEnabled;
         }
@@ -208,6 +210,7 @@
         /**
          * @return true if longpress is enabled, else false.
          */
+        @Override
         public boolean isLongpressEnabled() {
             return mIsLongpressEnabled;
         }
@@ -220,6 +223,7 @@
          * @return true if the {@link OnGestureListener} consumed the event,
          *              else false.
          */
+        @Override
         public boolean onTouchEvent(MotionEvent ev) {
             final int action = ev.getAction();
 
diff --git a/compat/java/android/support/v4/view/ViewCompat.java b/compat/java/android/support/v4/view/ViewCompat.java
index 1c46b3d..5912156 100644
--- a/compat/java/android/support/v4/view/ViewCompat.java
+++ b/compat/java/android/support/v4/view/ViewCompat.java
@@ -485,15 +485,18 @@
         WeakHashMap<View, ViewPropertyAnimatorCompat> mViewPropertyAnimatorCompatMap = null;
         private static Method sChildrenDrawingOrderMethod;
 
+        @Override
         public boolean canScrollHorizontally(View v, int direction) {
             return (v instanceof ScrollingView) &&
                 canScrollingViewScrollHorizontally((ScrollingView) v, direction);
         }
+        @Override
         public boolean canScrollVertically(View v, int direction) {
             return (v instanceof ScrollingView) &&
                     canScrollingViewScrollVertically((ScrollingView) v, direction);
         }
 
+        @Override
         public void setAccessibilityDelegate(View v, AccessibilityDelegateCompat delegate) {
             // Do nothing; API doesn't exist
         }
@@ -503,67 +506,87 @@
             return false;
         }
 
+        @Override
         public void onPopulateAccessibilityEvent(View v, AccessibilityEvent event) {
             // Do nothing; API doesn't exist
         }
+        @Override
         public void onInitializeAccessibilityEvent(View v, AccessibilityEvent event) {
          // Do nothing; API doesn't exist
         }
+        @Override
         public void onInitializeAccessibilityNodeInfo(View v, AccessibilityNodeInfoCompat info) {
             // Do nothing; API doesn't exist
         }
+        @Override
         public boolean hasTransientState(View view) {
             // A view can't have transient state if transient state wasn't supported.
             return false;
         }
+        @Override
         public void setHasTransientState(View view, boolean hasTransientState) {
             // Do nothing; API doesn't exist
         }
+        @Override
         public void postInvalidateOnAnimation(View view) {
             view.invalidate();
         }
+        @Override
         public void postInvalidateOnAnimation(View view, int left, int top, int right, int bottom) {
             view.invalidate(left, top, right, bottom);
         }
+        @Override
         public void postOnAnimation(View view, Runnable action) {
             view.postDelayed(action, getFrameTime());
         }
+        @Override
         public void postOnAnimationDelayed(View view, Runnable action, long delayMillis) {
             view.postDelayed(action, getFrameTime() + delayMillis);
         }
         long getFrameTime() {
             return FAKE_FRAME_TIME;
         }
+        @Override
         public int getImportantForAccessibility(View view) {
             return 0;
         }
+        @Override
         public void setImportantForAccessibility(View view, int mode) {
 
         }
+        @Override
         public boolean isImportantForAccessibility(View view) {
             return true;
         }
+        @Override
         public boolean performAccessibilityAction(View view, int action, Bundle arguments) {
             return false;
         }
+        @Override
         public AccessibilityNodeProviderCompat getAccessibilityNodeProvider(View view) {
             return null;
         }
+        @Override
         public float getAlpha(View view) {
             return 1.0f;
         }
+        @Override
         public void setLayerType(View view, int layerType, Paint paint) {
             // No-op until layers became available (HC)
         }
+        @Override
         public int getLayerType(View view) {
             return LAYER_TYPE_NONE;
         }
+        @Override
         public int getLabelFor(View view) {
             return 0;
         }
+        @Override
         public void setLabelFor(View view, int id) {
 
         }
+        @Override
         public void setLayerPaint(View view, Paint p) {
             // No-op until layers became available (HC)
         }
@@ -583,6 +606,7 @@
             return view.getParent();
         }
 
+        @Override
         public int resolveSizeAndState(int size, int measureSpec, int childMeasuredState) {
             return View.resolveSize(size, measureSpec);
         }
@@ -926,6 +950,7 @@
             return false;
         }
 
+        @Override
         public void setNestedScrollingEnabled(View view, boolean enabled) {
             if (view instanceof NestedScrollingChild) {
                 ((NestedScrollingChild) view).setNestedScrollingEnabled(enabled);
@@ -984,6 +1009,7 @@
             }
         }
 
+        @Override
         public boolean startNestedScroll(View view, int axes) {
             if (view instanceof NestedScrollingChild) {
                 return ((NestedScrollingChild) view).startNestedScroll(axes);
@@ -1069,6 +1095,7 @@
             return getTranslationZ(view) + getElevation(view);
         }
 
+        @Override
         public void setZ(View view, float z) {
             // no-op
         }
diff --git a/compat/java/android/support/v4/view/ViewGroupCompat.java b/compat/java/android/support/v4/view/ViewGroupCompat.java
index fbb75c7..0fa76cd 100644
--- a/compat/java/android/support/v4/view/ViewGroupCompat.java
+++ b/compat/java/android/support/v4/view/ViewGroupCompat.java
@@ -55,11 +55,13 @@
     }
 
     static class ViewGroupCompatStubImpl implements ViewGroupCompatImpl {
+        @Override
         public boolean onRequestSendAccessibilityEvent(
                 ViewGroup group, View child, AccessibilityEvent event) {
             return true;
         }
 
+        @Override
         public void setMotionEventSplittingEnabled(ViewGroup group, boolean split) {
             // no-op, didn't exist.
         }
diff --git a/compat/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java b/compat/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
index 19d893d..734c246c 100644
--- a/compat/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
+++ b/compat/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
@@ -45,31 +45,37 @@
     }
 
     static class AccessibilityManagerStubImpl implements AccessibilityManagerVersionImpl {
+        @Override
         public Object newAccessiblityStateChangeListener(
                 AccessibilityStateChangeListenerCompat listener) {
             return null;
         }
 
+        @Override
         public boolean addAccessibilityStateChangeListener(AccessibilityManager manager,
                 AccessibilityStateChangeListenerCompat listener) {
             return false;
         }
 
+        @Override
         public boolean removeAccessibilityStateChangeListener(AccessibilityManager manager,
                 AccessibilityStateChangeListenerCompat listener) {
             return false;
         }
 
+        @Override
         public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList(
                 AccessibilityManager manager, int feedbackTypeFlags) {
             return Collections.emptyList();
         }
 
+        @Override
         public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList(
                 AccessibilityManager manager) {
             return Collections.emptyList();
         }
 
+        @Override
         public boolean isTouchExplorationEnabled(AccessibilityManager manager) {
             return false;
         }
@@ -82,6 +88,7 @@
                 final AccessibilityStateChangeListenerCompat listener) {
             return AccessibilityManagerCompatIcs.newAccessibilityStateChangeListener(
                 new AccessibilityStateChangeListenerBridge() {
+                    @Override
                     public void onAccessibilityStateChanged(boolean enabled) {
                         listener.onAccessibilityStateChanged(enabled);
                     }
diff --git a/compat/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java b/compat/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
index dee67c9..9d00c58 100644
--- a/compat/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
+++ b/compat/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
@@ -80,186 +80,232 @@
     }
 
     static class AccessibilityRecordStubImpl implements AccessibilityRecordImpl {
+        @Override
         public Object obtain() {
             return null;
         }
 
+        @Override
         public Object obtain(Object record) {
             return null;
         }
 
+        @Override
         public int getAddedCount(Object record) {
             return 0;
         }
 
+        @Override
         public CharSequence getBeforeText(Object record) {
             return null;
         }
 
+        @Override
         public CharSequence getClassName(Object record) {
             return null;
         }
 
+        @Override
         public CharSequence getContentDescription(Object record) {
             return null;
         }
 
+        @Override
         public int getCurrentItemIndex(Object record) {
             return 0;
         }
 
+        @Override
         public int getFromIndex(Object record) {
             return 0;
         }
 
+        @Override
         public int getItemCount(Object record) {
             return 0;
         }
 
+        @Override
         public int getMaxScrollX(Object record) {
             return 0;
         }
 
+        @Override
         public int getMaxScrollY(Object record) {
             return 0;
         }
 
+        @Override
         public Parcelable getParcelableData(Object record) {
             return null;
         }
 
+        @Override
         public int getRemovedCount(Object record) {
             return 0;
         }
 
+        @Override
         public int getScrollX(Object record) {
             return 0;
         }
 
+        @Override
         public int getScrollY(Object record) {
             return 0;
         }
 
+        @Override
         public AccessibilityNodeInfoCompat getSource(Object record) {
             return null;
         }
 
+        @Override
         public List<CharSequence> getText(Object record) {
             return Collections.emptyList();
         }
 
+        @Override
         public int getToIndex(Object record) {
             return 0;
         }
 
+        @Override
         public int getWindowId(Object record) {
             return 0;
         }
 
+        @Override
         public boolean isChecked(Object record) {
             return false;
         }
 
+        @Override
         public boolean isEnabled(Object record) {
             return false;
         }
 
+        @Override
         public boolean isFullScreen(Object record) {
             return false;
         }
 
+        @Override
         public boolean isPassword(Object record) {
             return false;
         }
 
+        @Override
         public boolean isScrollable(Object record) {
             return false;
         }
 
+        @Override
         public void recycle(Object record) {
 
         }
 
+        @Override
         public void setAddedCount(Object record, int addedCount) {
 
         }
 
+        @Override
         public void setBeforeText(Object record, CharSequence beforeText) {
 
         }
 
+        @Override
         public void setChecked(Object record, boolean isChecked) {
 
         }
 
+        @Override
         public void setClassName(Object record, CharSequence className) {
 
         }
 
+        @Override
         public void setContentDescription(Object record, CharSequence contentDescription) {
 
         }
 
+        @Override
         public void setCurrentItemIndex(Object record, int currentItemIndex) {
 
         }
 
+        @Override
         public void setEnabled(Object record, boolean isEnabled) {
 
         }
 
+        @Override
         public void setFromIndex(Object record, int fromIndex) {
 
         }
 
+        @Override
         public void setFullScreen(Object record, boolean isFullScreen) {
 
         }
 
+        @Override
         public void setItemCount(Object record, int itemCount) {
 
         }
 
+        @Override
         public void setMaxScrollX(Object record, int maxScrollX) {
 
         }
 
+        @Override
         public void setMaxScrollY(Object record, int maxScrollY) {
 
         }
 
+        @Override
         public void setParcelableData(Object record, Parcelable parcelableData) {
 
         }
 
+        @Override
         public void setPassword(Object record, boolean isPassword) {
 
         }
 
+        @Override
         public void setRemovedCount(Object record, int removedCount) {
 
         }
 
+        @Override
         public void setScrollX(Object record, int scrollX) {
 
         }
 
+        @Override
         public void setScrollY(Object record, int scrollY) {
 
         }
 
+        @Override
         public void setScrollable(Object record, boolean scrollable) {
 
         }
 
+        @Override
         public void setSource(Object record, View source) {
 
         }
 
+        @Override
         public void setSource(Object record, View root, int virtualDescendantId) {
 
         }
 
+        @Override
         public void setToIndex(Object record, int toIndex) {
 
         }
diff --git a/compat/java/android/support/v4/widget/EdgeEffectCompat.java b/compat/java/android/support/v4/widget/EdgeEffectCompat.java
index df69ca3..d65fb67 100644
--- a/compat/java/android/support/v4/widget/EdgeEffectCompat.java
+++ b/compat/java/android/support/v4/widget/EdgeEffectCompat.java
@@ -59,80 +59,99 @@
      * Null implementation to use pre-ICS
      */
     static class BaseEdgeEffectImpl implements EdgeEffectImpl {
+        @Override
         public Object newEdgeEffect(Context context) {
             return null;
         }
 
+        @Override
         public void setSize(Object edgeEffect, int width, int height) {
         }
 
+        @Override
         public boolean isFinished(Object edgeEffect) {
             return true;
         }
 
+        @Override
         public void finish(Object edgeEffect) {
         }
 
+        @Override
         public boolean onPull(Object edgeEffect, float deltaDistance) {
             return false;
         }
 
+        @Override
         public boolean onRelease(Object edgeEffect) {
             return false;
         }
 
+        @Override
         public boolean onAbsorb(Object edgeEffect, int velocity) {
             return false;
         }
 
+        @Override
         public boolean draw(Object edgeEffect, Canvas canvas) {
             return false;
         }
 
+        @Override
         public boolean onPull(Object edgeEffect, float deltaDistance, float displacement) {
             return false;
         }
     }
 
     static class EdgeEffectIcsImpl implements EdgeEffectImpl {
+        @Override
         public Object newEdgeEffect(Context context) {
             return EdgeEffectCompatIcs.newEdgeEffect(context);
         }
 
+        @Override
         public void setSize(Object edgeEffect, int width, int height) {
             EdgeEffectCompatIcs.setSize(edgeEffect, width, height);
         }
 
+        @Override
         public boolean isFinished(Object edgeEffect) {
             return EdgeEffectCompatIcs.isFinished(edgeEffect);
         }
 
+        @Override
         public void finish(Object edgeEffect) {
             EdgeEffectCompatIcs.finish(edgeEffect);
         }
 
+        @Override
         public boolean onPull(Object edgeEffect, float deltaDistance) {
             return EdgeEffectCompatIcs.onPull(edgeEffect, deltaDistance);
         }
 
+        @Override
         public boolean onRelease(Object edgeEffect) {
             return EdgeEffectCompatIcs.onRelease(edgeEffect);
         }
 
+        @Override
         public boolean onAbsorb(Object edgeEffect, int velocity) {
             return EdgeEffectCompatIcs.onAbsorb(edgeEffect, velocity);
         }
 
+        @Override
         public boolean draw(Object edgeEffect, Canvas canvas) {
             return EdgeEffectCompatIcs.draw(edgeEffect, canvas);
         }
 
+        @Override
         public boolean onPull(Object edgeEffect, float deltaDistance, float displacement) {
             return EdgeEffectCompatIcs.onPull(edgeEffect, deltaDistance);
         }
     }
 
     static class EdgeEffectLollipopImpl extends EdgeEffectIcsImpl {
+        @Override
         public boolean onPull(Object edgeEffect, float deltaDistance, float displacement) {
             return EdgeEffectCompatLollipop.onPull(edgeEffect, deltaDistance, displacement);
         }
diff --git a/core-ui/java/android/support/v4/view/AbsSavedState.java b/core-ui/java/android/support/v4/view/AbsSavedState.java
index e5aba09..be15396 100644
--- a/core-ui/java/android/support/v4/view/AbsSavedState.java
+++ b/core-ui/java/android/support/v4/view/AbsSavedState.java
@@ -73,10 +73,12 @@
         return mSuperState;
     }
 
+    @Override
     public int describeContents() {
         return 0;
     }
 
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeParcelable(mSuperState, flags);
     }
diff --git a/core-ui/java/android/support/v4/view/PagerTitleStrip.java b/core-ui/java/android/support/v4/view/PagerTitleStrip.java
index 288e1a0..4a3467b 100644
--- a/core-ui/java/android/support/v4/view/PagerTitleStrip.java
+++ b/core-ui/java/android/support/v4/view/PagerTitleStrip.java
@@ -87,12 +87,14 @@
     }
 
     static class PagerTitleStripImplBase implements PagerTitleStripImpl {
+        @Override
         public void setSingleLineAllCaps(TextView text) {
             text.setSingleLine();
         }
     }
 
     static class PagerTitleStripImplIcs implements PagerTitleStripImpl {
+        @Override
         public void setSingleLineAllCaps(TextView text) {
             PagerTitleStripIcs.setSingleLineAllCaps(text);
         }
diff --git a/core-ui/java/android/support/v4/view/ViewPager.java b/core-ui/java/android/support/v4/view/ViewPager.java
index 9b826cd..773d190 100644
--- a/core-ui/java/android/support/v4/view/ViewPager.java
+++ b/core-ui/java/android/support/v4/view/ViewPager.java
@@ -146,6 +146,7 @@
     };
 
     private static final Interpolator sInterpolator = new Interpolator() {
+        @Override
         public float getInterpolation(float t) {
             t -= 1.0f;
             return t * t * t * t * t + 1.0f;
@@ -267,6 +268,7 @@
     public static final int SCROLL_STATE_SETTLING = 2;
 
     private final Runnable mEndScrollRunnable = new Runnable() {
+        @Override
         public void run() {
             setScrollState(SCROLL_STATE_IDLE);
             populate();
diff --git a/core-ui/java/android/support/v4/widget/CursorAdapter.java b/core-ui/java/android/support/v4/widget/CursorAdapter.java
index 96d9cfa..7635a90 100644
--- a/core-ui/java/android/support/v4/widget/CursorAdapter.java
+++ b/core-ui/java/android/support/v4/widget/CursorAdapter.java
@@ -190,6 +190,7 @@
      * Returns the cursor.
      * @return the cursor.
      */
+    @Override
     public Cursor getCursor() {
         return mCursor;
     }
@@ -197,6 +198,7 @@
     /**
      * @see android.widget.ListAdapter#getCount()
      */
+    @Override
     public int getCount() {
         if (mDataValid && mCursor != null) {
             return mCursor.getCount();
@@ -208,6 +210,7 @@
     /**
      * @see android.widget.ListAdapter#getItem(int)
      */
+    @Override
     public Object getItem(int position) {
         if (mDataValid && mCursor != null) {
             mCursor.moveToPosition(position);
@@ -220,6 +223,7 @@
     /**
      * @see android.widget.ListAdapter#getItemId(int)
      */
+    @Override
     public long getItemId(int position) {
         if (mDataValid && mCursor != null) {
             if (mCursor.moveToPosition(position)) {
@@ -240,6 +244,7 @@
     /**
      * @see android.widget.ListAdapter#getView(int, View, ViewGroup)
      */
+    @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         if (!mDataValid) {
             throw new IllegalStateException("this should only be called when the cursor is valid");
@@ -311,6 +316,7 @@
      * 
      * @param cursor The new cursor to be used
      */
+    @Override
     public void changeCursor(Cursor cursor) {
         Cursor old = swapCursor(cursor);
         if (old != null) {
@@ -363,6 +369,7 @@
      * @param cursor the cursor to convert to a CharSequence
      * @return a CharSequence representing the value
      */
+    @Override
     public CharSequence convertToString(Cursor cursor) {
         return cursor == null ? "" : cursor.toString();
     }
@@ -392,6 +399,7 @@
      * @see #getFilterQueryProvider()
      * @see #setFilterQueryProvider(android.widget.FilterQueryProvider)
      */
+    @Override
     public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
         if (mFilterQueryProvider != null) {
             return mFilterQueryProvider.runQuery(constraint);
@@ -400,6 +408,7 @@
         return mCursor;
     }
 
+    @Override
     public Filter getFilter() {
         if (mCursorFilter == null) {
             mCursorFilter = new CursorFilter(this);
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index 0f933bc7..452d570 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -301,18 +301,22 @@
     }
 
     static class DrawerLayoutCompatImplBase implements DrawerLayoutCompatImpl {
+        @Override
         public void configureApplyInsets(View drawerLayout) {
             // This space for rent
         }
 
+        @Override
         public void dispatchChildInsets(View child, Object insets, int drawerGravity) {
             // This space for rent
         }
 
+        @Override
         public void applyMarginInsets(MarginLayoutParams lp, Object insets, int drawerGravity) {
             // This space for rent
         }
 
+        @Override
         public int getTopInset(Object insets) {
             return 0;
         }
@@ -324,18 +328,22 @@
     }
 
     static class DrawerLayoutCompatImplApi21 implements DrawerLayoutCompatImpl {
+        @Override
         public void configureApplyInsets(View drawerLayout) {
             DrawerLayoutCompatApi21.configureApplyInsets(drawerLayout);
         }
 
+        @Override
         public void dispatchChildInsets(View child, Object insets, int drawerGravity) {
             DrawerLayoutCompatApi21.dispatchChildInsets(child, insets, drawerGravity);
         }
 
+        @Override
         public void applyMarginInsets(MarginLayoutParams lp, Object insets, int drawerGravity) {
             DrawerLayoutCompatApi21.applyMarginInsets(lp, insets, drawerGravity);
         }
 
+        @Override
         public int getTopInset(Object insets) {
             return DrawerLayoutCompatApi21.getTopInset(insets);
         }
@@ -1529,6 +1537,7 @@
         return wantTouchEvents;
     }
 
+    @Override
     public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
         if (CHILDREN_DISALLOW_INTERCEPT ||
                 (!mLeftDragger.isEdgeTouched(ViewDragHelper.EDGE_LEFT) &&
diff --git a/core-ui/java/android/support/v4/widget/FocusStrategy.java b/core-ui/java/android/support/v4/widget/FocusStrategy.java
index 8be9f1a..ac16ebe 100644
--- a/core-ui/java/android/support/v4/widget/FocusStrategy.java
+++ b/core-ui/java/android/support/v4/widget/FocusStrategy.java
@@ -103,6 +103,7 @@
             mAdapter = adapter;
         }
 
+        @Override
         public int compare(T first, T second) {
             final Rect firstRect = mTemp1;
             final Rect secondRect = mTemp2;
diff --git a/core-ui/java/android/support/v4/widget/NestedScrollView.java b/core-ui/java/android/support/v4/widget/NestedScrollView.java
index fe8dc7e..7b2cb60 100644
--- a/core-ui/java/android/support/v4/widget/NestedScrollView.java
+++ b/core-ui/java/android/support/v4/widget/NestedScrollView.java
@@ -936,6 +936,7 @@
         return mVerticalScrollFactor;
     }
 
+    @Override
     protected void onOverScrolled(int scrollX, int scrollY,
             boolean clampedX, boolean clampedY) {
         super.scrollTo(scrollX, scrollY);
@@ -1866,10 +1867,12 @@
 
         public static final Parcelable.Creator<SavedState> CREATOR
                 = new Parcelable.Creator<SavedState>() {
+            @Override
             public SavedState createFromParcel(Parcel in) {
                 return new SavedState(in);
             }
 
+            @Override
             public SavedState[] newArray(int size) {
                 return new SavedState[size];
             }
diff --git a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
index 44cdfd4..1acdf84 100644
--- a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
+++ b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
@@ -1500,6 +1500,7 @@
     }
 
     static class SlidingPanelLayoutImplBase implements SlidingPanelLayoutImpl {
+        @Override
         public void invalidateChildRegion(SlidingPaneLayout parent, View child) {
             ViewCompat.postInvalidateOnAnimation(parent, child.getLeft(), child.getTop(),
                     child.getRight(), child.getBottom());
diff --git a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
index b3749fc..3a13aa9 100644
--- a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
+++ b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
@@ -331,6 +331,7 @@
         setNestedScrollingEnabled(true);
     }
 
+    @Override
     protected int getChildDrawingOrder(int childCount, int i) {
         if (mCircleViewIndex < 0) {
             return i;
diff --git a/core-ui/java/android/support/v4/widget/ViewDragHelper.java b/core-ui/java/android/support/v4/widget/ViewDragHelper.java
index 4fd4538..39972f0 100644
--- a/core-ui/java/android/support/v4/widget/ViewDragHelper.java
+++ b/core-ui/java/android/support/v4/widget/ViewDragHelper.java
@@ -325,6 +325,7 @@
      * Interpolator defining the animation curve for mScroller
      */
     private static final Interpolator sInterpolator = new Interpolator() {
+        @Override
         public float getInterpolation(float t) {
             t -= 1.0f;
             return t * t * t * t * t + 1.0f;
@@ -332,6 +333,7 @@
     };
 
     private final Runnable mSetIdleRunnable = new Runnable() {
+        @Override
         public void run() {
             setDragState(STATE_IDLE);
         }
diff --git a/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
index 70a0129..a6fa8d7 100644
--- a/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
+++ b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
@@ -217,6 +217,7 @@
         // Ignore pre-v21
     }
 
+    @Override
     void getPadding(Rect rect) {
         mShadowDrawable.getPadding(rect);
     }
diff --git a/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java b/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
index 1d00a00..438fe8a 100644
--- a/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
+++ b/design/gingerbread/android/support/design/widget/ValueAnimatorCompatImplGingerbread.java
@@ -187,6 +187,7 @@
     }
 
     private final Runnable mRunnable = new Runnable() {
+        @Override
         public void run() {
             update();
         }
diff --git a/design/lollipop/android/support/design/widget/CoordinatorLayoutInsetsHelperLollipop.java b/design/lollipop/android/support/design/widget/CoordinatorLayoutInsetsHelperLollipop.java
index 6615050..7f673c7 100644
--- a/design/lollipop/android/support/design/widget/CoordinatorLayoutInsetsHelperLollipop.java
+++ b/design/lollipop/android/support/design/widget/CoordinatorLayoutInsetsHelperLollipop.java
@@ -22,6 +22,7 @@
 
 class CoordinatorLayoutInsetsHelperLollipop implements CoordinatorLayoutInsetsHelper {
 
+    @Override
     public void setupForWindowInsets(View view, OnApplyWindowInsetsListener insetsListener) {
         if (ViewCompat.getFitsSystemWindows(view)) {
             // First apply the insets listener
diff --git a/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java b/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
index 2b85845..89d78b7 100644
--- a/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
+++ b/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
@@ -156,6 +156,7 @@
         return new CircularBorderDrawableLollipop();
     }
 
+    @Override
     void getPadding(Rect rect) {
         if (mShadowViewDelegate.isCompatPaddingEnabled()) {
             final float radius = mShadowViewDelegate.getRadius();
diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index 94e908a..2d3e2fc 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -1460,6 +1460,7 @@
         return p instanceof LayoutParams && super.checkLayoutParams(p);
     }
 
+    @Override
     public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
         boolean handled = false;
 
@@ -1481,6 +1482,7 @@
         return handled;
     }
 
+    @Override
     public void onNestedScrollAccepted(View child, View target, int nestedScrollAxes) {
         mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, nestedScrollAxes);
         mNestedScrollingDirectChild = child;
@@ -1501,6 +1503,7 @@
         }
     }
 
+    @Override
     public void onStopNestedScroll(View target) {
         mNestedScrollingParentHelper.onStopNestedScroll(target);
 
@@ -1524,6 +1527,7 @@
         mNestedScrollingTarget = null;
     }
 
+    @Override
     public void onNestedScroll(View target, int dxConsumed, int dyConsumed,
             int dxUnconsumed, int dyUnconsumed) {
         final int childCount = getChildCount();
@@ -1549,6 +1553,7 @@
         }
     }
 
+    @Override
     public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
         int xConsumed = 0;
         int yConsumed = 0;
@@ -1584,6 +1589,7 @@
         }
     }
 
+    @Override
     public boolean onNestedFling(View target, float velocityX, float velocityY, boolean consumed) {
         boolean handled = false;
 
@@ -1607,6 +1613,7 @@
         return handled;
     }
 
+    @Override
     public boolean onNestedPreFling(View target, float velocityX, float velocityY) {
         boolean handled = false;
 
@@ -1626,6 +1633,7 @@
         return handled;
     }
 
+    @Override
     public int getNestedScrollAxes() {
         return mNestedScrollingParentHelper.getNestedScrollAxes();
     }
diff --git a/graphics/drawable/animated/src/android/support/graphics/drawable/AnimatedVectorDrawableCompat.java b/graphics/drawable/animated/src/android/support/graphics/drawable/AnimatedVectorDrawableCompat.java
index a8b3230..f172738 100644
--- a/graphics/drawable/animated/src/android/support/graphics/drawable/AnimatedVectorDrawableCompat.java
+++ b/graphics/drawable/animated/src/android/support/graphics/drawable/AnimatedVectorDrawableCompat.java
@@ -250,6 +250,7 @@
         mAnimatedVectorState.mVectorDrawable.setColorFilter(colorFilter);
     }
 
+    @Override
     public void setTint(int tint) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTint(mDelegateDrawable, tint);
@@ -259,6 +260,7 @@
         mAnimatedVectorState.mVectorDrawable.setTint(tint);
     }
 
+    @Override
     public void setTintList(ColorStateList tint) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTintList(mDelegateDrawable, tint);
@@ -268,6 +270,7 @@
         mAnimatedVectorState.mVectorDrawable.setTintList(tint);
     }
 
+    @Override
     public void setTintMode(PorterDuff.Mode tintMode) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTintMode(mDelegateDrawable, tintMode);
@@ -302,6 +305,7 @@
         return mAnimatedVectorState.mVectorDrawable.getOpacity();
     }
 
+    @Override
     public int getIntrinsicWidth() {
         if (mDelegateDrawable != null) {
             return mDelegateDrawable.getIntrinsicWidth();
@@ -309,6 +313,7 @@
         return mAnimatedVectorState.mVectorDrawable.getIntrinsicWidth();
     }
 
+    @Override
     public int getIntrinsicHeight() {
         if (mDelegateDrawable != null) {
             return mDelegateDrawable.getIntrinsicHeight();
@@ -405,6 +410,7 @@
         return;
     }
 
+    @Override
     public boolean canApplyTheme() {
         if (mDelegateDrawable != null) {
             return DrawableCompat.canApplyTheme(mDelegateDrawable);
diff --git a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
index 7e82be5..75d0312 100644
--- a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
+++ b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
@@ -217,6 +217,7 @@
         canvas.restoreToCount(saveCount);
     }
 
+    @Override
     public int getAlpha() {
         if (mDelegateDrawable != null) {
             return DrawableCompat.getAlpha(mDelegateDrawable);
@@ -264,6 +265,7 @@
         return new PorterDuffColorFilter(color, tintMode);
     }
 
+    @Override
     public void setTint(int tint) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTint(mDelegateDrawable, tint);
@@ -273,6 +275,7 @@
         setTintList(ColorStateList.valueOf(tint));
     }
 
+    @Override
     public void setTintList(ColorStateList tint) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTintList(mDelegateDrawable, tint);
@@ -287,6 +290,7 @@
         }
     }
 
+    @Override
     public void setTintMode(Mode tintMode) {
         if (mDelegateDrawable != null) {
             DrawableCompat.setTintMode(mDelegateDrawable, tintMode);
@@ -354,6 +358,7 @@
     }
 
     // Don't support re-applying themes. The initial theme loading is working.
+    @Override
     public boolean canApplyTheme() {
         if (mDelegateDrawable != null) {
             DrawableCompat.canApplyTheme(mDelegateDrawable);
@@ -455,6 +460,7 @@
         inflate(res, parser, attrs, null);
     }
 
+    @Override
     public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)
             throws XmlPullParserException, IOException {
         if (mDelegateDrawable != null) {
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
index 4528d05..37ae62d 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -689,10 +689,12 @@
             mCallbacks = callbacks;
         }
 
+        @Override
         public IBinder asBinder() {
             return mCallbacks.getBinder();
         }
 
+        @Override
         public void onConnect(String root, MediaSessionCompat.Token session, Bundle extras)
                 throws RemoteException {
             if (extras == null) {
@@ -706,10 +708,12 @@
             sendRequest(SERVICE_MSG_ON_CONNECT, data);
         }
 
+        @Override
         public void onConnectFailed() throws RemoteException {
             sendRequest(SERVICE_MSG_ON_CONNECT_FAILED, null);
         }
 
+        @Override
         public void onLoadChildren(String mediaId, List<MediaBrowserCompat.MediaItem> list,
                 Bundle options) throws RemoteException {
             Bundle data = new Bundle();
diff --git a/media-compat/java/android/support/v4/media/TransportMediator.java b/media-compat/java/android/support/v4/media/TransportMediator.java
index 2a5bbea..7021717 100644
--- a/media-compat/java/android/support/v4/media/TransportMediator.java
+++ b/media-compat/java/android/support/v4/media/TransportMediator.java
@@ -133,6 +133,7 @@
             return isMediaKey(keyCode) ? mCallbacks.onMediaButtonDown(keyCode, event) : false;
         }
 
+        @Override
         public boolean onKeyLongPress(int keyCode, KeyEvent event) {
             return false;
         }
@@ -200,10 +201,12 @@
         return event.dispatch(mKeyEventCallback, (KeyEvent.DispatcherState) mDispatcherState, this);
     }
 
+    @Override
     public void registerStateListener(TransportStateListener listener) {
         mListeners.add(listener);
     }
 
+    @Override
     public void unregisterStateListener(TransportStateListener listener) {
         mListeners.remove(listener);
     }
@@ -328,6 +331,7 @@
      *      {@link #FLAG_KEY_MEDIA_FAST_FORWARD},
      *      {@link #FLAG_KEY_MEDIA_NEXT}
      */
+    @Override
     public int getTransportControlFlags() {
         return mCallbacks.onGetTransportControlFlags();
     }
diff --git a/transition/ics/android/support/transition/TransitionSetIcs.java b/transition/ics/android/support/transition/TransitionSetIcs.java
index e98915a..744033e 100644
--- a/transition/ics/android/support/transition/TransitionSetIcs.java
+++ b/transition/ics/android/support/transition/TransitionSetIcs.java
@@ -25,10 +25,12 @@
         init(transition, mTransitionSet);
     }
 
+    @Override
     public int getOrdering() {
         return mTransitionSet.getOrdering();
     }
 
+    @Override
     public TransitionSetIcs setOrdering(int ordering) {
         mTransitionSet.setOrdering(ordering);
         return this;
diff --git a/transition/kitkat/android/support/transition/TransitionSetKitKat.java b/transition/kitkat/android/support/transition/TransitionSetKitKat.java
index 76d06ee..591df63 100644
--- a/transition/kitkat/android/support/transition/TransitionSetKitKat.java
+++ b/transition/kitkat/android/support/transition/TransitionSetKitKat.java
@@ -25,10 +25,12 @@
         init(transition, mTransitionSet);
     }
 
+    @Override
     public int getOrdering() {
         return mTransitionSet.getOrdering();
     }
 
+    @Override
     public TransitionSetKitKat setOrdering(int ordering) {
         mTransitionSet.setOrdering(ordering);
         return this;
diff --git a/transition/src/android/support/transition/Transition.java b/transition/src/android/support/transition/Transition.java
index e3b140e..dffc9c0 100644
--- a/transition/src/android/support/transition/Transition.java
+++ b/transition/src/android/support/transition/Transition.java
@@ -173,6 +173,7 @@
      * @see #captureStartValues(TransitionValues)
      * @see #createAnimator(ViewGroup, TransitionValues, TransitionValues)
      */
+    @Override
     public abstract void captureEndValues(@NonNull TransitionValues transitionValues);
 
     /**
@@ -202,6 +203,7 @@
      * @see #captureEndValues(TransitionValues)
      * @see #createAnimator(ViewGroup, TransitionValues, TransitionValues)
      */
+    @Override
     public abstract void captureStartValues(@NonNull TransitionValues transitionValues);
 
     /**
@@ -249,6 +251,7 @@
      * overall transition for this scene change. A null value means no animation
      * should be run.
      */
+    @Override
     @Nullable
     public abstract Animator createAnimator(@NonNull ViewGroup sceneRoot,
             @NonNull TransitionValues startValues, @NonNull TransitionValues endValues);
@@ -642,6 +645,7 @@
          *
          * @param transition The started transition.
          */
+        @Override
         void onTransitionStart(@NonNull Transition transition);
 
         /**
@@ -653,6 +657,7 @@
          *
          * @param transition The transition which reached its end.
          */
+        @Override
         void onTransitionEnd(@NonNull Transition transition);
 
         /**
@@ -665,6 +670,7 @@
          *
          * @param transition The transition which was canceled.
          */
+        @Override
         void onTransitionCancel(@NonNull Transition transition);
 
         /**
@@ -677,6 +683,7 @@
          *
          * @param transition The transition which was paused.
          */
+        @Override
         void onTransitionPause(@NonNull Transition transition);
 
         /**
@@ -688,6 +695,7 @@
          *
          * @param transition The transition which was resumed.
          */
+        @Override
         void onTransitionResume(@NonNull Transition transition);
     }
 
diff --git a/v13/java/android/support/v13/app/FragmentCompat.java b/v13/java/android/support/v13/app/FragmentCompat.java
index 3812a97..38e4a48 100644
--- a/v13/java/android/support/v13/app/FragmentCompat.java
+++ b/v13/java/android/support/v13/app/FragmentCompat.java
@@ -40,10 +40,13 @@
     }
 
     static class BaseFragmentCompatImpl implements FragmentCompatImpl {
+        @Override
         public void setMenuVisibility(Fragment f, boolean visible) {
         }
+        @Override
         public void setUserVisibleHint(Fragment f, boolean deferStart) {
         }
+        @Override
         public void requestPermissions(final Fragment fragment, final String[] permissions,
                 final int requestCode) {
             Handler handler = new Handler(Looper.getMainLooper());
@@ -71,6 +74,7 @@
                 }
             });
         }
+        @Override
         public boolean shouldShowRequestPermissionRationale(Fragment fragment, String permission) {
             return false;
         }
diff --git a/v13/java/android/support/v13/app/FragmentTabHost.java b/v13/java/android/support/v13/app/FragmentTabHost.java
index fa1aad2..9ca61aba 100644
--- a/v13/java/android/support/v13/app/FragmentTabHost.java
+++ b/v13/java/android/support/v13/app/FragmentTabHost.java
@@ -106,10 +106,12 @@
 
         public static final Parcelable.Creator<SavedState> CREATOR
                 = new Parcelable.Creator<SavedState>() {
+            @Override
             public SavedState createFromParcel(Parcel in) {
                 return new SavedState(in);
             }
 
+            @Override
             public SavedState[] newArray(int size) {
                 return new SavedState[size];
             }
diff --git a/v17/leanback/src/android/support/v17/leanback/app/BaseRowFragment.java b/v17/leanback/src/android/support/v17/leanback/app/BaseRowFragment.java
index 8a65b0d..2ddea53 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BaseRowFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BaseRowFragment.java
@@ -90,10 +90,12 @@
     private class LateSelectionObserver extends RecyclerView.AdapterDataObserver {
         boolean mIsLateSelection = false;
 
+        @Override
         public void onChanged() {
             performLateSelection();
         }
 
+        @Override
         public void onItemRangeInserted(int positionStart, int itemCount) {
             performLateSelection();
         }
diff --git a/v17/leanback/src/android/support/v17/leanback/app/BaseRowSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/BaseRowSupportFragment.java
index a202fb2..847eb57 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BaseRowSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BaseRowSupportFragment.java
@@ -92,10 +92,12 @@
     private class LateSelectionObserver extends RecyclerView.AdapterDataObserver {
         boolean mIsLateSelection = false;
 
+        @Override
         public void onChanged() {
             performLateSelection();
         }
 
+        @Override
         public void onItemRangeInserted(int positionStart, int itemCount) {
             performLateSelection();
         }
diff --git a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
index 4825cb1..8de7bf7 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlayFragment.java
@@ -181,6 +181,7 @@
 
     private final VerticalGridView.OnTouchInterceptListener mOnTouchInterceptListener =
             new VerticalGridView.OnTouchInterceptListener() {
+        @Override
         public boolean onInterceptTouchEvent(MotionEvent event) {
             return onInterceptInputEvent(event);
         }
@@ -188,6 +189,7 @@
 
     private final VerticalGridView.OnKeyInterceptListener mOnKeyInterceptListener =
             new VerticalGridView.OnKeyInterceptListener() {
+        @Override
         public boolean onInterceptKeyEvent(KeyEvent event) {
             return onInterceptInputEvent(event);
         }
@@ -743,6 +745,7 @@
     }
 
     private final DataObserver mObserver = new DataObserver() {
+        @Override
         public void onChanged() {
             updateControlsBottomSpace(null);
         }
@@ -752,10 +755,13 @@
         ArrayList<View> mViews = new ArrayList<View>();
         ArrayList<Integer> mLayerType = new ArrayList<Integer>();
 
+        @Override
         public void onAnimationCancel(Animator animation) {
         }
+        @Override
         public void onAnimationRepeat(Animator animation) {
         }
+        @Override
         public void onAnimationStart(Animator animation) {
             getViews(mViews);
             for (View view : mViews) {
@@ -763,6 +769,7 @@
                 view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
             }
         }
+        @Override
         public void onAnimationEnd(Animator animation) {
             for (int i = 0; i < mViews.size(); i++) {
                 mViews.get(i).setLayerType(mLayerType.get(i), null);
diff --git a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
index 9fd1805..bbcd30e 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/PlaybackOverlaySupportFragment.java
@@ -183,6 +183,7 @@
 
     private final VerticalGridView.OnTouchInterceptListener mOnTouchInterceptListener =
             new VerticalGridView.OnTouchInterceptListener() {
+        @Override
         public boolean onInterceptTouchEvent(MotionEvent event) {
             return onInterceptInputEvent(event);
         }
@@ -190,6 +191,7 @@
 
     private final VerticalGridView.OnKeyInterceptListener mOnKeyInterceptListener =
             new VerticalGridView.OnKeyInterceptListener() {
+        @Override
         public boolean onInterceptKeyEvent(KeyEvent event) {
             return onInterceptInputEvent(event);
         }
@@ -745,6 +747,7 @@
     }
 
     private final DataObserver mObserver = new DataObserver() {
+        @Override
         public void onChanged() {
             updateControlsBottomSpace(null);
         }
@@ -754,10 +757,13 @@
         ArrayList<View> mViews = new ArrayList<View>();
         ArrayList<Integer> mLayerType = new ArrayList<Integer>();
 
+        @Override
         public void onAnimationCancel(Animator animation) {
         }
+        @Override
         public void onAnimationRepeat(Animator animation) {
         }
+        @Override
         public void onAnimationStart(Animator animation) {
             getViews(mViews);
             for (View view : mViews) {
@@ -765,6 +771,7 @@
                 view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
             }
         }
+        @Override
         public void onAnimationEnd(Animator animation) {
             for (int i = 0; i < mViews.size(); i++) {
                 mViews.get(i).setLayerType(mLayerType.get(i), null);
diff --git a/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java b/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
index ea9e138..90b597a 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/SearchFragment.java
@@ -225,6 +225,7 @@
     private boolean mPendingStartRecognitionWhenPaused;
     private SearchBar.SearchBarPermissionListener mPermissionListener
             = new SearchBar.SearchBarPermissionListener() {
+        @Override
         public void requestAudioPermission() {
             PermissionHelper.requestPermissions(SearchFragment.this,
                     new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSION_REQUEST_CODE);
diff --git a/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
index 0368339..2e8dda6 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/SearchSupportFragment.java
@@ -227,12 +227,14 @@
     private boolean mPendingStartRecognitionWhenPaused;
     private SearchBar.SearchBarPermissionListener mPermissionListener
             = new SearchBar.SearchBarPermissionListener() {
+        @Override
         public void requestAudioPermission() {
             PermissionHelper.requestPermissions(SearchSupportFragment.this,
                     new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSION_REQUEST_CODE);
         }
     };
 
+    @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions,
                                            int[] grantResults) {
         if (requestCode == AUDIO_PERMISSION_REQUEST_CODE && permissions.length > 0) {
diff --git a/v17/leanback/src/android/support/v17/leanback/transition/TransitionHelper.java b/v17/leanback/src/android/support/v17/leanback/transition/TransitionHelper.java
index 198c914..7437227 100644
--- a/v17/leanback/src/android/support/v17/leanback/transition/TransitionHelper.java
+++ b/v17/leanback/src/android/support/v17/leanback/transition/TransitionHelper.java
@@ -164,16 +164,20 @@
             ArrayList<TransitionListener> mTransitionListeners;
         }
 
+        @Override
         public void setEnterTransition(android.app.Fragment fragment, Object transition) {
         }
 
+        @Override
         public void setExitTransition(android.app.Fragment fragment, Object transition) {
         }
 
+        @Override
         public void setSharedElementEnterTransition(android.app.Fragment fragment,
                 Object transition) {
         }
 
+        @Override
         public void addSharedElement(android.app.FragmentTransaction ft,
                 View view, String transitionName) {
         }
@@ -528,19 +532,23 @@
 
     static final class TransitionHelperApi21Impl extends TransitionHelperKitkatImpl {
 
+        @Override
         public void setEnterTransition(android.app.Fragment fragment, Object transition) {
             TransitionHelperApi21.setEnterTransition(fragment, transition);
         }
 
+        @Override
         public void setExitTransition(android.app.Fragment fragment, Object transition) {
             TransitionHelperApi21.setExitTransition(fragment, transition);
         }
 
+        @Override
         public void setSharedElementEnterTransition(android.app.Fragment fragment,
                 Object transition) {
             TransitionHelperApi21.setSharedElementEnterTransition(fragment, transition);
         }
 
+        @Override
         public void addSharedElement(android.app.FragmentTransaction ft,
                 View view, String transitionName) {
             TransitionHelperApi21.addSharedElement(ft, view, transitionName);
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
index e8b55dc..df457b1 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
@@ -579,6 +579,7 @@
             RecyclerView.ViewHolder vh = findViewHolderForPosition(position);
             if (vh == null) {
                 addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
+                    @Override
                     public void onChildViewHolderSelected(RecyclerView parent,
                             RecyclerView.ViewHolder child, int selectedPosition, int subposition) {
                         if (selectedPosition == position) {
@@ -604,6 +605,7 @@
             RecyclerView.ViewHolder vh = findViewHolderForPosition(position);
             if (vh == null) {
                 addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
+                    @Override
                     public void onChildViewHolderSelected(RecyclerView parent,
                             RecyclerView.ViewHolder child, int selectedPosition, int subposition) {
                         if (selectedPosition == position) {
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
index 7de13f2..5e3e74c 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
@@ -1801,6 +1801,7 @@
         updateScrollSecondAxis();
     }
 
+    @Override
     public void removeAndRecycleAllViews(RecyclerView.Recycler recycler) {
         if (TRACE) TraceHelper.beginSection("removeAndRecycleAllViews");
         if (DEBUG) Log.v(TAG, "removeAndRecycleAllViews " + getChildCount());
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java b/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
index 74b02ab..90df9de 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
@@ -1073,6 +1073,7 @@
                     }
                     mSubActionsGridView.removeOnLayoutChangeListener(this);
                     mMainView.post(new Runnable() {
+                        @Override
                         public void run() {
                             if (mMainView == null) {
                                 return;
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/picker/DatePicker.java b/v17/leanback/src/android/support/v17/leanback/widget/picker/DatePicker.java
index 06aa4fe..542634b2ac 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/picker/DatePicker.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/picker/DatePicker.java
@@ -399,6 +399,7 @@
         // in scroll pass.  UpdateSpinner can be called in a scroll pass, UpdateSpinner() may
         // notifyDataSetChange to update the range.
         post(new Runnable() {
+            @Override
             public void run() {
                 updateSpinnersImpl(animation);
             }