**NASTY** workaround for YouTube's setVideoScalingMode exception
Merge remote-tracking branch 'cm/jellybean' into jellybean-aml
FM Radio: Add support for FM Radio in Android

Creating interface and framework for using FM Radio
RX and TX from different vendors.

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java
SistemUI: updated romanian translation

this should fix this :

https://www.dropbox.com/s/m44e9ssroszz8bt/Screenshot_2013-01-22-23-34-07.png

Change-Id: I5880f041d6cb1eada3039e6d667e4c3aa333e7b0
Signed-off-by: Johnnyslt <johnny@esi.ro>
PhoneProxy: On v6 or greater RIL, when LTE_ON_CDMA is TRUE,

always create CDMALTEPhone. Newer phones now have v7 RIL
which needs this to be true also.

Change-Id: Ic69f33a166067a2f77fc48446a361f40ac41e734
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>
Merge "SistemUI: updated romanian translation" into jellybean
Smdk4210RIL: fix emergency dialing

Change-Id: I75f1991fdb04ad3043d6ffb5879a9498f27297a4
Merge "FM Radio: Add support for FM Radio in Android" into jellybean
Move core/java/com/android/internal/widget/multiwaveview to framework2.jar

Change-Id: I6eb15aebdb9cef6b9e7b43b40873914ce5523654
rework powered/plugged/charging logic

 * Reworks "isPowered/isPluggued/isCharging" code to correctly report
   charging status.  Note that some devices can draw more than 500mA,
   so "plugged" != "charging" (as is assumed in existing code).
   This faulty assumption can result in incorrect charging status
   reported and inability to shutdown at critical battery level.

Change-Id: I6b3282df6513a8c235b0f4cdfd9e16f531e34166
FM Radio: Remove unnecessary line breaks

Fixes keyboard glitch mentioned here: http://review.cyanogenmod.org/#/c/30390/

Change-Id: Ic7fc4ce1efc5272515d317f225b674b7a334bf43
Merge branch 'jellybean-aml' of https://github.com/christiantroy/android_frameworks_base into jellybean-aml
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into jellybean-aml

Conflicts:
	services/java/com/android/server/PowerManagerService.java