added contact lockscreen icon

Change-Id: I204e3a43d3e2beed391e605f3d3add55b24bb4b7
aapt: add check for untranslatable "string-array"s

Change-Id: Id884af0505c0bcdfa20b400fcdd54f699f8ef38f
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Keep keyboard lit until the screen is dimmed

Do not use button timeout for keyboard (which is intrusive on QWERTY
sliders). Keep it lit until the screen dims instead of turning it off
like the buttons after 5 seconds. Also consider setting keyboard
visibility as a user activity.
input: added support for multiple keyevents

- Multiple keyevents can now be send from the command line:

    input keyevent <key code number or name> ...

  Sometimes invoking 'input' repeatedly does not send the events fast
  enough, this change solves the problem by allowing multiple key code
  number or names be added to the command line.

Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737
Merge "aapt: add check for untranslatable "string-array"s" into cm-10.1
aapt: allow toggling "errors instead of warnings"

* This patch makes the default behaviour same as AOSP,
  treating untranslatable strings in any but the default
  locale as warnings.
* Setting the environment variable AAPT_ERROR_ON_WARNING to
  anything will make those warnings, errors.

Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Change-Id: I7da98d277495a7646ad64ba2f7e6a6bf14290f98
Frameworks_base: refactor translations

Not others languages in progress

Change-Id: I996968b7a2a70fd3705a13cb7e38d663c2d8b814
SystemUI: Update brightness dialog, on updateResources()

The small dialog also deserves the chance to get updated
resources.

Thank you Jiangyi, for finding that one.

Patch Set 2: Unbreak things

Change-Id: I6e9de7c35abff52c2fcc2952771bb42b406496ed
Duplicate Media cleanup

Clean duplicate notifications and ringtones.
JIRA : https://jira.cyanogenmod.org/browse/CYAN-292

Change-Id: Icab24ca455891c2347fd521e4d8c804cb024c51f
Option to use volume keys to control media volume anytime (2/2)

See Settings part for description

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823
Merge "Option to use volume keys to control media volume anytime (2/2)" into cm-10.1
FrameworkBase: Add missing AF translations

Change-Id: Ifb927bb38d46e450321f9014f65719c561eb8b43
Merge "added contact lockscreen icon" into cm-10.1
audio: Add overlay to fix analog docks.

Of particular interest to devices using libhardware_legacy and
affected by commit 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a: http://goo.gl/rVR1Z
which restricted the routing of AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
to docks using FORCE_ANALOG_DOCK cases. The EXTRA_DOCK_STATE_CAR case is
returning FORCE_BT_CAR_DOCK, preventing the dock audio from routing properly.

Add an overlay option for overriding to FORCE_ANALOG_DOCK.

Change-Id: Ib7d70c242aa6f537ea5d65098ceb2c591662d8bb
Framework: HU translation fix

Patch set 2: Trigger Cid
Patch set 3: Trigger Cid
Patch set 4: Trigger Cid

Change-Id: I23030d5cb6a4c5ad794a269b82adad76d473a82f
PowerMenu : Profile entry fix

Always reinflate views
Jira : https://jira.cyanogenmod.org/browse/CYAN-1017

Change-Id: Ib348bb4c9a85b6433a86eeed1b0de9deff9d50bc
Merge "SystemUI: Update brightness dialog, on updateResources()" into cm-10.1
NFC polling mode (3/3)

Change-Id: Ia03413578d47e7cd0ffb3080778b6a1154cfc651

Conflicts:
	core/java/android/provider/Settings.java
Merge branch 'cm-10.1' of ssh://github.com/abmantis/android_frameworks_base