Merge "Fix javadoc." into jb-dev

2 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/camera/ShutterButton.java b/src/com/android/camera/ShutterButton.java
index a9bcb548..f3e12898 100755
--- a/src/com/android/camera/ShutterButton.java
+++ b/src/com/android/camera/ShutterButton.java
@@ -66,7 +66,7 @@ public class ShutterButton extends ImageView {
                 //    focus pressed, optional camera pressed, focus released.
                 // We want to emulate this sequence of events with the shutter
                 // button. When clicking using a trackball button, the view
-                // system changes the the drawable state before posting click
+                // system changes the drawable state before posting click
                 // notification, so the sequence of events is:
                 //    pressed(true), optional click, pressed(false)
                 // When clicking using touch events, the view system changes the
diff --git a/src/com/android/camera/ui/ControlPanelLayout.java b/src/com/android/camera/ui/ControlPanelLayout.java
index 21b508d2..0727c948 100644
--- a/src/com/android/camera/ui/ControlPanelLayout.java
+++ b/src/com/android/camera/ui/ControlPanelLayout.java
@@ -23,7 +23,7 @@ import android.util.Log;
 import android.widget.RelativeLayout;
 
 /**
- * A layout which handles the the width of the control panel, which contains
+ * A layout which handles the width of the control panel, which contains
  * the shutter button, thumbnail, front/back camera picker, and mode picker.
  * The purpose of this is to have a consistent width of control panel in camera,
  * camcorder, and panorama modes.