Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

Bug: 112104996
Change-Id: Iec32f622f0bb1bc1583aefcbf6d115ad05baa693

1 files changed, 4 insertions, 9 deletions

diff --git a/src/com/android/tv/menu/PlayControlsRow.java b/src/com/android/tv/menu/PlayControlsRow.java
index a60ff153..f19bd2b0 100644
--- a/src/com/android/tv/menu/PlayControlsRow.java
+++ b/src/com/android/tv/menu/PlayControlsRow.java
@@ -17,7 +17,6 @@
 package com.android.tv.menu;
 
 import android.content.Context;
-
 import com.android.tv.R;
 import com.android.tv.TimeShiftManager;
 import com.android.tv.ui.TunableTvView;
@@ -28,8 +27,8 @@ public class PlayControlsRow extends MenuRow {
     private final TunableTvView mTvView;
     private final TimeShiftManager mTimeShiftManager;
 
-    public PlayControlsRow(Context context, TunableTvView tvView, Menu menu,
-            TimeShiftManager timeShiftManager) {
+    public PlayControlsRow(
+            Context context, TunableTvView tvView, Menu menu, TimeShiftManager timeShiftManager) {
         super(context, menu, R.string.menu_title_play_controls, R.dimen.play_controls_height);
         mTvView = tvView;
         mTimeShiftManager = timeShiftManager;
@@ -45,16 +44,12 @@ public class PlayControlsRow extends MenuRow {
         return R.layout.play_controls;
     }
 
-    /**
-     * Returns TV view.
-     */
+    /** Returns TV view. */
     public TunableTvView getTvView() {
         return mTvView;
     }
 
-    /**
-     * Returns an instance of {@link TimeShiftManager}.
-     */
+    /** Returns an instance of {@link TimeShiftManager}. */
     public TimeShiftManager getTimeShiftManager() {
         return mTimeShiftManager;
     }