diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-21 00:52:26 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | c092fdfc985acdee43073c7196f56758c6ee6fc0 (patch) | |
| tree | 3fafa162cc12fad5fd1f694341d7cb7ddbe6eee2 /src/com/android/camera/VideoUI.java | |
| parent | dbccf969d529ba0eed79c8e69e9e65d5c172f505 (diff) | |
| download | android_packages_apps_Snap-c092fdfc985acdee43073c7196f56758c6ee6fc0.tar.gz android_packages_apps_Snap-c092fdfc985acdee43073c7196f56758c6ee6fc0.tar.bz2 android_packages_apps_Snap-c092fdfc985acdee43073c7196f56758c6ee6fc0.zip | |
camera2: More fixes
Change-Id: Ic1d125657efc96d71b5d7bd9e4e29c362fb600f8
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 } } |