Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/frameworks/base into aosp

Conflicts:
	core/res/res/values-de/strings.xml
	core/res/res/values-el/strings.xml
	core/res/res/values-nl/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/config.xml
	data/fonts/Roboto-Bold.ttf
	data/fonts/Roboto-BoldItalic.ttf
	data/fonts/Roboto-Italic.ttf
	data/fonts/Roboto-Regular.ttf
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I376757e52555fe45860f404da5fd2293ea45ddce
frameworks/base:  fix duplicate strings in el/ja/ko translations

Looks like these were duplicated in the 4.0.4 merge, remove one set.

Change-Id: Iabb85f088132a3db94c6e2c2490954641e67e81a
camera: Full support for HTC camera switch

 * Adds the changes for using the "htcwc" switch.
   We still need this even on ICS.

Change-Id: I5f24cb379b359c5796748f496a03ef431c36e283
frameworks/base: SystemUI: fix merge error in NetworkController

Remove dangling else statement.

Change-Id: I40e9facc6d81e70abb7d179c71765520437b89bf
Merge "camera: Full support for HTC camera switch" into ics
Merge "frameworks/base: SystemUI: fix merge error in NetworkController" into ics
Add missing symbols for HTC 8660 camera HAL.

Change-Id: Ia542981bc07cfb22da1bae75af5a4554f7100ef5
Merge "stagefright: more exynos4 enhancements" into ics
Merge "Add missing symbols for HTC 8660 camera HAL." into ics
omxcodec: added buffersize logic back in

got lost with merge of 1d73f2b83f17e009150685be4d40c5f9b4065ae6

Change-Id: I0a185dd1b14d0ced4d96b0d8cc1515b7ba18abea
Add missing symbols for HTC 8660 camera HAL.

Change-Id: Ia542981bc07cfb22da1bae75af5a4554f7100ef5
Merge "softwarerenderer: exynos4: mali alignment" into ics
stagefright: remove extra QCOM ifndef

from http://review.cyanogenmod.com/13991
This define was called within a larger QCOM ifdef and wont be used
the original commit from CAF was ment to replace the line when
DIVX311 was added

Change-Id: Ieda4eae1b47d54cba5ea7d5ec02402ceed560f54
Merge "libstagefright: fix build for msm7x27" into ics
Merge "stagefright: remove extra QCOM ifndef" into ics
samsung: set proper native color format if using samsung codecs

Change-Id: Ifd76d88f9f7a1947a1583322f0a675dec6d12edf
frameworks/base: bluetooth: AVRCP 1.3 feature changes

Bluetooth module will listen metadata/event change intents
from Music app and post data to Bluez stack.

Modified by Chris Boyle: removed PLAYSTATUS_REQUEST/RESPONSE.
See http://review.cyanogenmod.com/14001

Conflicts:

	core/java/android/server/BluetoothA2dpService.java
	core/jni/android_server_BluetoothEventLoop.cpp

Gingerbread change Icbfb1712dde98c9677f57c869bcfffed2bb42a14

Change-Id: Id8cbec68302b53befbec4273013668a58c755369
Add separate headset and speaker volumes

This is a simple implementation of keeping separate volume
settings for the wired headset and the speaker without
overhauling the audio system.

This allows a person with sensitive headphones to keep music, ringer
and other stream volumes lower than they would usually keep the
speaker volumes.

Change-Id: Ia614c1e3ac548ff4e0104a090cda13b9daef09cb
Merge "Add separate headset and speaker volumes" into ics
Merge "Fixing a bug that when an app is dismissed or loaded that changes the current active audio stream, if the volume overlay is visible during the swap, if you adjust the volume (with hard keys) after the steam has changed while the panel is still visible, the wrong panel (view) is still visible on-top of the one that is being adjusted." into ics