Possible leak in android_emoji_EmojiFactory_newInstance

jchars is not released correctly if factory is NULL.
In addition, unnecessary string conversion removed.

Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
telephony: hide needsOldRilFeature

Change-Id: I741b510fdacc166ad40741bf2e9db5c8a1039384
PT-BR: Added missing translations

Change-Id: I0616fbbd61742553bd03c1d64a2c792ad55fb2e9
base: fix constant conflict

There is a conflict 2 media type which shares the same constants which is a DVIX and JPEG.
which causes some app to think jpeg is a dvix video file
It was due to the merge of the qualcomm patches (patch: http://review.cyanogenmod.org/#/c/28960/ ) which was merged on the 23rd

Change-Id: Ida014adab4a954aa81a16d1ff401f9847f87d1a5
Added hungarian translations

Change-Id: I0d914e50fad24dd42ce86f85dbdfb47a788df707
framework: Update German quick settings translation

Patch Set 1:	* add some strings
		* rename some strings

Change-Id: I082ae344fd92b680b275a01c518ced681f06b77c
Add config_speed_up_audio_on_mt_calls option

Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
power: Add CPU boosting interface

 * Boosts CPU using Power HAL for the given duration.
 * Duration is given in microseconds.
 * Power HAL must implement POWER_HINT_CPU_BOOST.

Change-Id: Ic79baf7e3d0f75483c2fe8a242b4c3d93368b68b
Add CPU boosting hooks

 * Boost CPU to max during scrolling
 * Boost CPU to max on activity start/resume
 * Inspired by a patch from CodeAuora.

Change-Id: I72f2c2851b01fbceabddead03a4c3a7a0526ca61
Properly handle changes in phone audio focus.

Change-Id: I921651684f4369a47aa83e93010266c40be71a41
Merge "Properly handle changes in phone audio focus." into cm-10.1
Merge "framework: Update German quick settings translation" into cm-10.1
Disable touch while using the stylus (Galaxy Note)

Android 4.0 cannot form multitouch events from multiple input
devices. So it is not possible to report one touchpoint from the
stylus position and, at the same time, another touchpoint from a
finger touch. Instead, when a new input device starts up the currently
active input is cancelled. This is highly undesirable while writing
with the pen.

The easiest solution is to ignore non-stylus touch events while the
stylus is within range (hovering) of the touchscreen. For example,
N-trig digitizers implement this in hardware. But wacom digitizers do
report pen data simultaneously with touch data. This patch disables
(non-stylus) touch input within 50ms of stylus data. On my Galaxy
Note this is necessary to make stylus input usable.

Change-Id: I9f458d85d8bf83d6cf03b467d46ce066fd55b7e0

Conflicts:
	services/input/InputReader.cpp
	services/input/InputReader.h
Increase lock screen widget limit from 5 to 9

Agreement seems to have landed on 9 as a sane value for the lock screen widgets
limit, and since there is no drawback for those with fewer, configuration is
unneeded.

Change-Id: I432c90113e31d953b2450770bfceb5f6e2e0e173
Use standard formula for calculating hwrotation

Change-Id: I12efbce4a8107a1058921e5ec4cb4b6e0ef072ab
Merge "Increase lock screen widget limit from 5 to 9" into cm-10.1
frameworks/base: Dutch translations

Change-Id: I7adf723e44389fa05a1920d785cc6434c3473336
QuickSettingsController.java: remove unneeded casts

mContainerView is final and always an instance of QuickSettingsContainerView,
as provided to the constructor. There is no need to hold a reference to a
super-class of it.

Change-Id: Iddca83bf9d251553d4ae9c2d2c54446336f16f6f
Quick Settings: Actually update resources, when asked

Failure to do so causes the quick settings tiles not to be updated to
reflect system locale changes. The tiles remains at the previous locale.

Patch set 2: Remove unnecessary casts.

Patch set 3: Remove one last cast, only possible now that
             http://review.cyanogenmod.org/29350 has been merged.

Change-Id: I42bf8208a2f82dd0f2441685df6a7af2a81b611b