Reconcile with ics-mr0-release

Change-Id: Id88ea6a8f34481b4dbbed4bfac44e8be2abf6ab2
am f587df73: Reconcile with ics-mr0-release

* commit 'f587df73563cee9dccbcd29390734152d9fe99f6':
Merge "Change the default orientation to portrait." into ics-mr1
am cd225637: Merge "Change the default orientation to portrait." into ics-mr1

* commit 'cd2256375a71ae4c19808d22c313d999cc750d0c':
  Change the default orientation to portrait.
Back to the first-level when recording on Tablet.

bug:5395575
Change-Id: I1493466068ce76dce957cd717a602939c66f138c
Fix the disabled icons overlapped issue.

bug:5515221
Change-Id: I9fe40f6492afdd8906ea2ad31839ec34f22a28b7
Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"

This reverts commit 4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89, reversing
changes made to 174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d.
5554028: Select video snapshot resolution based on the video recording aspect ratio.

Change-Id: I7b01a21271068b9d201e38197e2a61b183f87902
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-factoryrom-2-release history after reset to ics-mr0
Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"

This reverts commit 4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89, reversing
changes made to 174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d.
Import revised translations.

Change-Id: Id655054596190e1a2c18a6c979023edc709e5811
am abf79a3e: am 4d55f6cb: Merge "Remove long pressing shutter triggers autocous." into ics-mr0

* commit 'abf79a3e25e6c631275e9f81424c0aa25ec9191b':
  Remove long pressing shutter triggers autocous.
am 365dab37: Merge "Replace hardcoded value with public API constant" into ics-mr1

* commit '365dab37335c5c0a0ab97ad7ebb28e63046913b7':
  Replace hardcoded value with public API constant
am 73e69d00: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '73e69d00829e978fa9a4f06f81390ac56302a646':
  Import revised translations.  DO NOT MERGE
am f587df73: Reconcile with ics-mr0-release

* commit 'f587df73563cee9dccbcd29390734152d9fe99f6':
am cd225637: Merge "Change the default orientation to portrait." into ics-mr1

* commit 'cd2256375a71ae4c19808d22c313d999cc750d0c':
  Change the default orientation to portrait.
am 74ab5fa0: (-s ours) am 73e69d00: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '74ab5fa071a21893398dda5d2a73345f109a8358':
  Import revised translations.  DO NOT MERGE
am c12480bb: am f587df73: Reconcile with ics-mr0-release

* commit 'c12480bbac9f853e8317b5d808f32f9af2c4fa38':
Reconcile with ics-factoryrom-2-release

Change-Id: I1f671bf650765b06ffbccedc1a0f3906afc4d6f3