Merge "Code reformatting for upcoming automated code changes." am: 661facc2f1

am: aca9678a86

Change-Id: I153eca69dcddd809f11ebc398380a5dca9408041
This commit is contained in:
Mathew Inwood
2018-08-21 03:07:25 -07:00
committed by android-build-merger

View File

@@ -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;