Prepare for 2.x push

library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java

@@ -87,7 +87,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
 
 
   }
   }
 
 
-  // TODO: Use MediaFormat constants if these get exposed through the API. See [Internal: b/14127601].
+  // TODO: Use MediaFormat constants if these get exposed through the API. See
+  // [Internal: b/14127601].
   private static final String KEY_CROP_LEFT = "crop-left";
   private static final String KEY_CROP_LEFT = "crop-left";
   private static final String KEY_CROP_RIGHT = "crop-right";
   private static final String KEY_CROP_RIGHT = "crop-right";
   private static final String KEY_CROP_BOTTOM = "crop-bottom";
   private static final String KEY_CROP_BOTTOM = "crop-bottom";

library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java

@@ -85,7 +85,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
   /**
   /**
    * A base class for parsers that parse components of a smooth streaming manifest.
    * A base class for parsers that parse components of a smooth streaming manifest.
    */
    */
-  private static abstract class ElementParser {
+  private abstract static class ElementParser {
 
 
     private final String baseUri;
     private final String baseUri;
     private final String tag;
     private final String tag;