commit 8b9bdf4f613b75f56385043b36b3314fe160d9c1
author Chiou-Hao Hsu <chsu@codeaurora.org> Wed Jun 11 20:05:11 2014 -0700
committer Chiou-Hao Hsu <chsu@codeaurora.org> Wed Jun 11 20:05:11 2014 -0700
tree 65cee77765cb658f7480b80307a98520a31e8008
parent 410c490c52b2313e00c9ab4eb5f9c0f67d1face3
parent 9d8187cbdb82e36eae9a42eefda138b6d0925b1f

Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

* tag 'android-4.4.3_r1':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Remove TRIM support
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix samsung video recording
  Fix WB indicator override
  Revert fixed focus area in CAF mode
  Add another HTC picture resolution
  Always set focus mode first before applying scene mode
  Reduce logging of flattened Preferences
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

Conflicts:
	res/values/arrays.xml
	src/com/android/camera/FocusOverlayManager.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/VideoModule.java

Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e