Merge "Code reformatting for upcoming automated code changes."

am: 661facc2f1

Change-Id: Ie2c10b5d6afadec937400f651aecc08a9aa494df

core/java/android/widget/MediaController.java

@@ -77,7 +77,8 @@ public class MediaController extends FrameLayout {
     private View mDecor;
     private WindowManager.LayoutParams mDecorLayoutParams;
     private ProgressBar mProgress;
-    private TextView mEndTime, mCurrentTime;
+    private TextView mEndTime;
+    private TextView mCurrentTime;
     private boolean mShowing;
     private boolean mDragging;
     private static final int sDefaultTimeout = 3000;