Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.

Bug: 11773268

Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

* commit '7dc6e97c508125b94fffc15c4a8f0b6c989f396c':
  Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Import translations. DO NOT MERGE

Change-Id: I2db02a5ec058c2eed8d08a490aeed180095bd58d
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1
Auto-generated-cl: translation import
am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE

* commit '18eb2e4e7f35a5dfbeea6e3c64b612769bb31293':
  Import translations. DO NOT MERGE
Import translations. DO NOT MERGE

Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I258a9c2191463a2d46a6524e6523c7639ee183b4
Auto-generated-cl: translation import
am adf70222: (-s ours) Import translations. DO NOT MERGE

* commit 'adf70222d8c493a6880c54b8f939c541a61949bf':
  Import translations. DO NOT MERGE
Reduce logging of flattened Preferences

Bug: 11901390

Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
am 88f9b3e7: Reduce logging of flattened Preferences

* commit '88f9b3e75c313d181c49ac644930627c40b2138d':
  Reduce logging of flattened Preferences
Always set focus mode first before applying scene mode

cherrypick from Bryce branch

  Bug: 9577903
  Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
am 7993f452: Always set focus mode first before applying scene mode

* commit '7993f4521011869a794da69e4d0057fe3b0886c3':
  Always set focus mode first before applying scene mode
Add another HTC picture resolution

patching into Carlsbad branch from Bryce

  Bug: 9370319

Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc

Conflicts:
	res/values/strings.xml
Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit '0d5505dd1a3bf297677161c4c6608c783d7a2b68':
  Add another HTC picture resolution
Revert fixed focus area in CAF mode

  Bug: 9306098

This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.

Cherrypick of Bryce CL into Carlsbad.

Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0

Conflicts:
	src/com/android/camera/FocusOverlayManager.java
am 0f7d5488: Revert fixed focus area in CAF mode

* commit '0f7d5488d33988c1ee3636fe3a7d6472bed84f00':
  Revert fixed focus area in CAF mode
Fix WB indicator override

Patching into Carlsbad from Bryce.

  Bug: 9372794

Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
Fix samsung video recording

Patching Bryce CL into Carlsbad

  Bug: 9056573

Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9

Conflicts:
	src/com/android/camera/VideoModule.java
am 13350e5e: Fix WB indicator override

* commit '13350e5e46db241b4f6d1ad3f371ac7292c12e65':
  Fix WB indicator override