Merge "Base Georgian files (cldr and location)" into ics
Merge "Update Russian Translation-ICS-Profiles" into ics
Merge "Fix profile text in global action menu" into ics
Merge "framework/base: tr: CM9: Added Turkish Translations" into ics
Merge "Lockscreen : Vol long press skip tracks (1/2)" into ics
Merge "Profiles: Addition of Wimax (1/2) + Logic Cleanup" into ics
Merge "Japanese: translation of 'profile' related entries." into ics
Profiles: Case insensitive duplicate name checking

 - Prevents duplicate names such as Default/default

Change-Id: I479a34192295677653985a66b05becb2d1b6cdf3
profiles: Add support for disabling screen lock

 * We can now have the option of disabling lockscreen security as part
   of the profile. A good use case for this is to create "Car" profile.
   You certainly don't want to input a pattern, or worse, face-unlock if
   you should happen to break the law and use your phone whilst driving.
 * Profile system now permits insecure mode or entirely disabling
   lockscreen as an override.
 * Fix issue where changes aren't applied if the active profile is
   modified.
 * Also fix a couple of string-comparison derps.

Change-Id: I07a09b7011bad4f32cdd7bfa576e3befa71193ea
Change PT-BR profile title in global action menu

Fix like changeset 13508

Change-Id: I37e3e5bc132ef3e0c1417fc125423feae7c76155
Add missing includes for threads.h

The missing header was being transitively included through a
Skia header which is being removed.

Change-Id: I5a65bae076027951fe07d1e7eecd4732124fb0e4
bootanim: Don't cache textures if they're expected to use a lot of VRAM

bootanimation cached all the textures generated until the animation
was completed.
For Hi-res animations with lots of frames (like the new CM9 anim on
xhdpi devices), this implied using large amounts of video RAM, more
than most devices actually have available, causing the animation to
stall (and in some cases, gralloc to lock up); so if an animation is
expected to use a lot of RAM (rough estimation based on frame size
and number of frames), disable cache entirely and generate the textures
on demand

Change-Id: I157e5cdde2aab1d82d980d77cbedd9f127c83a1d
profiles: Fix "disabled" lock screen mode

Without this fix, it's impossible to select the "Disabled" lock screen
mode.

Change-Id: I214f52093d78631f799a604394e838a4b329494a
Merge "docs: android u search class" into ics-mr1
docs: update various SDK and AVD Manager screenshots
and remove one from the licensing doc that's not necessary

Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
docs: fix toc in search au class

Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
Remove fade animations from framework drawables.

Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
Merge "bootanim: Don't cache textures if they're expected to use a lot of VRAM" into ics
Telephony: Make the compat-flag verification method available everywhere

Export needsOldRilFeature() through the commands interface to make it
available to other parts of the telephony stack

Change-Id: I0e6fec083f5208795bf5067f8c73e35660e942ed
Telephony: Make partial QCOM USIM support more widely available

The usage of special paths and network states for USIM cards isn't
limited to Huawei devices; it appears to be a common requirement
on recent CAF devices, so make it available under the "qcomuiccstack"
ril compatibility option

Change-Id: Idb1895061a4e05a6a6bb3df72336002bd53a3d4a