diff options
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 01a7f70a9..5af4ff29e 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -1225,6 +1225,5 @@ public class VideoUI implements PieRenderer.PieListener, mFaceView.setBlockDraw(true); mFaceView.clear(); } ->>>>>>> 7252fd0... SnapdragonCamera: Add face detection icon to video } } |