am 57c4f896: am cfc9bcc6: Fix race condition in preview startup.

* commit '57c4f8965fe9331235a777bd729745d1caf6347a':
  Fix race condition in preview startup.
am f5ba96ad: am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.

* commit 'f5ba96adb5d72f9cac77ff21614f54e0d2bbb795':
  Fix 5491362: don't open the camera in onResume in lockscreen.
am 83abe885: am 048edf2e: Fix focus area in front camera.

* commit '83abe885d9809c1404a1f7e17537ee9a9c61fb57':
  Fix focus area in front camera.
am e861e79c: (-s ours) am 74f4ae76: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'e861e79ceb35494a39fc8107addb16ac023b5946':
  Import revised translations.  DO NOT MERGE
am 40aaf11e: Merge "String scrub to bring to punc, wording, etc standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"

* commit '40aaf11efb32fe60a7d7bc876a301139056a5cce':
  String scrub to bring to punc, wording, etc standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
am 710927b3: (-s ours) am 37eac597: (-s ours) Import revised translations.  DO NOT MERGE

* commit '710927b37f73447dfc855d20c4aa609deb0742ef':
  Import revised translations.  DO NOT MERGE
am 9c890bec: Reconcile with ics-mr0-release

* commit '9c890bec972061e0e52b41a16a43d3b8fed73d34':
am 3ade8655: Fix startFaceDetection RuntimeException.

* commit '3ade8655b875f3fb4b8a4bfd09841f77e4fbe29d':
  Fix startFaceDetection RuntimeException.
am 7ac1bccd: Merge "Fix video thumbnail is not displayed when intent passes the fd." into ics-mr0

* commit '7ac1bccdef292bf84bf9d7e40d432a466c39663a':
  Fix video thumbnail is not displayed when intent passes the fd.
am 6f311d0b: Merge "Add missing state check in EffectsRecorder startup path." into ics-mr0

* commit '6f311d0bd4bf8dd8df62e656f737a9e369b3db3d':
  Add missing state check in EffectsRecorder startup path.
am 0cc07e3c: am 3ade8655: Fix startFaceDetection RuntimeException.

* commit '0cc07e3c07efca884a92555f7b8e27c5db2b2d78':
  Fix startFaceDetection RuntimeException.
am 08ce98ab: am 7ac1bccd: Merge "Fix video thumbnail is not displayed when intent passes the fd." into ics-mr0

* commit '08ce98ab99a4987c5e5bc4ae64a8b75948117a6e':
  Fix video thumbnail is not displayed when intent passes the fd.
am 87bf99b5: am 6f311d0b: Merge "Add missing state check in EffectsRecorder startup path." into ics-mr0

* commit '87bf99b5078feccd7dd0b079f350ebc5a9f78974':
  Add missing state check in EffectsRecorder startup path.
am c04d01bb: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'c04d01bb510465ea35a06b09146a3bb79c6f770e':
  Import revised translations.  DO NOT MERGE
am bd90ecf2: (-s ours) am c04d01bb: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'bd90ecf22d2d6c61548cbf0e8d9862dc209407cb':
  Import revised translations.  DO NOT MERGE
Reconcile with ics-mr0-release

Change-Id: I69f40d6509f2d77c09ccf62ddad090367a4253e8
am 454a5bd4: Reconcile with ics-mr0-release

* commit '454a5bd4ff602b4f3cdec60590a13614878d6cdf':
merge in ics-release history after reset to master
Reconcile with ics-mr0-release

Change-Id: I12ddab7e42df11b4e8669494953164f665e1d90a
Import revised translations.

Change-Id: I46f9e34b1355864a6d5c3e404c06b25397ade7f7