Remove trailing spaces.

Change-Id: I80feb1b58c148b35b2666ef08d4b13d5aa0608b2

33 files changed, 114 insertions, 114 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e1a6b46..b5189e3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-    
+
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/res/anim/footer_appear.xml b/res/anim/footer_appear.xml
index e9242b8..29e1c1d 100644
--- a/res/anim/footer_appear.xml
+++ b/res/anim/footer_appear.xml
@@ -3,16 +3,16 @@
 **
 ** Copyright 2009, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 -->
diff --git a/res/anim/footer_disappear.xml b/res/anim/footer_disappear.xml
index 1331931..bb1d966 100644
--- a/res/anim/footer_disappear.xml
+++ b/res/anim/footer_disappear.xml
@@ -3,16 +3,16 @@
 **
 ** Copyright 2009, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 -->
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml
index d1b9e5e..0942e98 100644
--- a/res/anim/slide_in.xml
+++ b/res/anim/slide_in.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<translate xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:fromXDelta="100%p" 
-	android:toXDelta="0" 
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+	android:fromXDelta="100%p"
+	android:toXDelta="0"
 	android:startOffset="0"
 	android:duration="400" />
diff --git a/res/anim/slide_in_vertical.xml b/res/anim/slide_in_vertical.xml
index 4727689..dca8dac 100644
--- a/res/anim/slide_in_vertical.xml
+++ b/res/anim/slide_in_vertical.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<translate xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:fromYDelta="100%p" 
-	android:toYDelta="0" 
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+	android:fromYDelta="100%p"
+	android:toYDelta="0"
 	android:startOffset="0"
 	android:duration="400" />
diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml
index 204cf28..d99b225 100644
--- a/res/anim/slide_out.xml
+++ b/res/anim/slide_out.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<translate xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:fromXDelta="0" 
-	android:toXDelta="-100%p" 
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+	android:fromXDelta="0"
+	android:toXDelta="-100%p"
 	android:startOffset="0"
 	android:duration="400" />
diff --git a/res/anim/slide_out_vertical.xml b/res/anim/slide_out_vertical.xml
index 3f3f2a0..5cbea74 100644
--- a/res/anim/slide_out_vertical.xml
+++ b/res/anim/slide_out_vertical.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<translate xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:fromYDelta="0" 
-	android:toYDelta="-100%p" 
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+	android:fromYDelta="0"
+	android:toYDelta="-100%p"
 	android:startOffset="0"
 	android:duration="400" />
diff --git a/res/anim/transition_in.xml b/res/anim/transition_in.xml
index 6c2ad61..2f037a3 100644
--- a/res/anim/transition_in.xml
+++ b/res/anim/transition_in.xml
@@ -4,21 +4,21 @@
 **
 ** Copyright 2007, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 -->
 
-<alpha xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:fromAlpha="0.0" 
-	android:toAlpha="1.0" 
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:fromAlpha="0.0"
+	android:toAlpha="1.0"
 	android:duration="1000" />
diff --git a/res/anim/transition_out.xml b/res/anim/transition_out.xml
index 76e67f4..4398f5d 100644
--- a/res/anim/transition_out.xml
+++ b/res/anim/transition_out.xml
@@ -4,16 +4,16 @@
 **
 ** Copyright 2007, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 -->
@@ -21,5 +21,5 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromAlpha="1.0"
     android:toAlpha="0.0"
-    android:duration="1000" 
+    android:duration="1000"
 />
diff --git a/res/drawable/btn_camera_arrow_left.xml b/res/drawable/btn_camera_arrow_left.xml
index 494899b..0380c2a 100644
--- a/res/drawable/btn_camera_arrow_left.xml
+++ b/res/drawable/btn_camera_arrow_left.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,8 +21,8 @@
 
     <item android:state_window_focused="true" android:state_focused="true"
         android:drawable="@drawable/btn_camera_arrow_left_selected" />
-        
-    <item 
+
+    <item
         android:drawable="@drawable/btn_camera_arrow_left_default" />
 
 </selector>
diff --git a/res/drawable/btn_camera_arrow_right.xml b/res/drawable/btn_camera_arrow_right.xml
index 1d0cc0c..3eeddc8 100644
--- a/res/drawable/btn_camera_arrow_right.xml
+++ b/res/drawable/btn_camera_arrow_right.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
     <item android:state_window_focused="true" android:state_focused="true"
         android:drawable="@drawable/btn_camera_arrow_right_selected" />
 
-    <item 
+    <item
         android:drawable="@drawable/btn_camera_arrow_right_default" />
 
 </selector>
diff --git a/res/drawable/frame_gallery_preview.xml b/res/drawable/frame_gallery_preview.xml
index 5550bff..546655e 100644
--- a/res/drawable/frame_gallery_preview.xml
+++ b/res/drawable/frame_gallery_preview.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
 
     <item android:state_selected="true" android:state_pressed="true"
         android:drawable="@drawable/frame_gallery_preview_album_pressed" />
-        
+
     <item android:state_selected="false" android:state_pressed="true"
         android:drawable="@drawable/frame_gallery_preview_album_pressed" />
 
diff --git a/res/drawable/ic_menu_attach.xml b/res/drawable/ic_menu_attach.xml
index 209f6b5..3526c78 100644
--- a/res/drawable/ic_menu_attach.xml
+++ b/res/drawable/ic_menu_attach.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* 
+/*
 ** Copyright 2006, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/drawable/ic_menu_cancel.xml b/res/drawable/ic_menu_cancel.xml
index 92960d9..8e65188 100644
--- a/res/drawable/ic_menu_cancel.xml
+++ b/res/drawable/ic_menu_cancel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* 
+/*
 ** Copyright 2006, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
index 07af8c6..36a0a61 100644
--- a/res/layout/attach_camera_control.xml
+++ b/res/layout/attach_camera_control.xml
@@ -66,7 +66,7 @@
                     android:textSize="12sp"
                     android:text="@string/review_retake" />
         </LinearLayout>
-        
+
         <LinearLayout android:orientation="vertical"
                 android:visibility="invisible"
                 android:layout_marginBottom="15dp"
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index b003e77..9ed2467 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -51,7 +51,7 @@
                 android:layout_marginBottom="3dp"
                 android:src="@drawable/btn_ic_mode_switch_camera"/>
     </LinearLayout>
-    
+
     <com.android.camera.ShutterButton android:id="@+id/shutter_button"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
diff --git a/res/layout/details.xml b/res/layout/details.xml
index 482e567..e3c1075 100644
--- a/res/layout/details.xml
+++ b/res/layout/details.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/layout/detailsview.xml b/res/layout/detailsview.xml
index 72a4aa8..d38ec3b 100644
--- a/res/layout/detailsview.xml
+++ b/res/layout/detailsview.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
     android:layout_width="300dip"
     android:layout_height="fill_parent">
 
-	<LinearLayout 
+	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
 
 		    <TextView
 		    	android:id="@+id/details_image_title"
-        	   	android:layout_height="wrap_content" 
+        	   	android:layout_height="wrap_content"
 			   	android:layout_width="wrap_content"
 			   	android:textAppearance="?android:attr/textAppearanceMedium"
 			   	android:paddingLeft="6dip"
@@ -64,7 +64,7 @@
 		    <TableRow>
 		        <TextView
 				    android:gravity="right"
-				    android:textAppearance="?android:attr/textAppearanceSmall" 
+				    android:textAppearance="?android:attr/textAppearanceSmall"
 				    android:text="@string/details_file_size"/>
 		        <TextView
 		            android:id="@+id/details_file_size_value"
@@ -187,7 +187,7 @@
 		            android:paddingLeft="5dip"
 		            android:textColor="?android:attr/textColorPrimary"/>
 		    </TableRow>
-		    
+		
 		    <TableRow
 		    	android:id="@+id/details_bit_rate_row">
 		        <TextView
@@ -239,5 +239,5 @@
 		</TableLayout>
 
 	</LinearLayout>
-    
+
 </ScrollView>
diff --git a/res/layout/gallerypicker.xml b/res/layout/gallerypicker.xml
index a2e7e55..2c0a5be 100644
--- a/res/layout/gallerypicker.xml
+++ b/res/layout/gallerypicker.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/layout/gallerypicker_no_images.xml b/res/layout/gallerypicker_no_images.xml
index ca926cf..bae0118 100644
--- a/res/layout/gallerypicker_no_images.xml
+++ b/res/layout/gallerypicker_no_images.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/layout/image_gallery.xml b/res/layout/image_gallery.xml
index d3d846f..5ef1ec7 100644
--- a/res/layout/image_gallery.xml
+++ b/res/layout/image_gallery.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index 9e3ba89..3008079 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,10 +16,10 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
-    android:layout_width="fill_parent" 
+    android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <VideoView android:id="@+id/surface_view" 
+    <VideoView android:id="@+id/surface_view"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerInParent="true" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index acd1794..8e73f97 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 19d6e26..5d0a93c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,16 +4,16 @@
 **
 ** Copyright 2008, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 -->
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 367bfa2..44dfd1a 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -19,4 +19,4 @@
 <resources>
 </resources>
 
-        
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e428b6c..f80be7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -133,7 +133,7 @@
     <string name="confirm_delete_message">The picture will be deleted.</string>
     <!-- Confirmation dialog message after deleting a video -->
     <string name="confirm_delete_video_message">The video will be deleted.</string>
-    
+
     <!-- Confirmation dialog message after deleting a multiple media files -->
     <string name="confirm_delete_multiple_message">These media files will be deleted.</string>
 
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 92ec85b..2c77183 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index d01002f..6da66c7 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -27,7 +27,7 @@
                 android:summary="@string/pref_camera_recordlocation_summary"
                 android:defaultValue="false"/>
     </PreferenceCategory>
-    
+
     <PreferenceCategory
       android:title="@string/pref_camera_video_settings_category">
         <!-- android:summary is filled in by CameraSettings -->
diff --git a/res/xml/gallery_preferences.xml b/res/xml/gallery_preferences.xml
index 4ee2646..b466bd1 100644
--- a/res/xml/gallery_preferences.xml
+++ b/res/xml/gallery_preferences.xml
@@ -20,7 +20,7 @@
 
     <PreferenceCategory
             android:title="@string/pref_gallery_category">
-            
+
         <!-- Display size -->
         <ListPreference
                 android:key="pref_gallery_size_key"
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 20fb20f..3aec9f2 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1305,8 +1305,8 @@ public class Camera extends Activity implements View.OnClickListener,
             return;
         }
 
-        // The mCameraDevice will be null if it is fail to connect to the 
-        // camera hardware. In this case we will show a dialog and then 
+        // The mCameraDevice will be null if it is fail to connect to the
+        // camera hardware. In this case we will show a dialog and then
         // finish the activity, so it's OK to ignore it.
         if (mCameraDevice == null) return;
 
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 6988b51..9aa72af 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -712,8 +712,8 @@ public class VideoCamera extends Activity implements View.OnClickListener,
             return;
         }
 
-        // The mCameraDevice will be null if it is fail to connect to the 
-        // camera hardware. In this case we will show a dialog and then 
+        // The mCameraDevice will be null if it is fail to connect to the
+        // camera hardware. In this case we will show a dialog and then
         // finish the activity, so it's OK to ignore it.
         if (mCameraDevice == null) return;
 
diff --git a/src/com/android/camera/gallery/DrmImageList.java b/src/com/android/camera/gallery/DrmImageList.java
index e30941d..4ff9057 100644
--- a/src/com/android/camera/gallery/DrmImageList.java
+++ b/src/com/android/camera/gallery/DrmImageList.java
@@ -48,7 +48,7 @@ public class DrmImageList extends ImageList implements IImageList {
         // We have no date information in DrmStore, so we just sort by _id.
         return "_id ASC";
     }
-    
+
     @Override
     protected Cursor createCursor() {
         return mContentResolver.query(
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 03a52ac..dfe7c38 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,8 +25,8 @@
             android:targetPackage="com.android.camera"
             android:label="Camera Launch Performance">
     </instrumentation>
-    
+
     <instrumentation android:name="android.test.InstrumentationTestRunner"
              android:targetPackage="com.android.camera"
              android:label="Tests for Camera application."/>
-</manifest> 
+</manifest>