From 10ae593a59aa50963e1d3159747da2d65ca79bed Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 4 Aug 2017 14:54:19 -0700 Subject: This change brings Dialer oc-mr1-dev up to date with v11.1 RC06. This is to resolve a merge conflict in: I48296c56fb1d275a06b7c314f5380266c1195ef2 Test: make master is already up to date and Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136 --- java/com/android/dialer/callcomposer/camera/CameraManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/dialer/callcomposer/camera/CameraManager.java') diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java index 783b57ec3..5915ce331 100644 --- a/java/com/android/dialer/callcomposer/camera/CameraManager.java +++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java @@ -118,7 +118,7 @@ public class CameraManager implements FocusOverlayManager.Listener { /** * The task for opening the camera, so it doesn't block the UI thread Using AsyncTask rather than * SafeAsyncTask because the tasks need to be serialized, but don't need to be on the UI thread - * TODO(blemmon): If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need + * TODO: If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need * to create a dedicated thread, or synchronize the threads in the thread pool */ private AsyncTask mOpenCameraTask; -- cgit v1.2.3