Merge "Fix resource leak: When call MediaMetadataRetriever.setDataSource or getFrameAtTime should ensure call release in finally to avoid resource leak                    Patch set 2: Remove unnecessary white spaces" into kitkat
Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" into kitkat
Merge "Make Navring available to devices with no navbar" into kitkat
fw: Ribbons Icon Gravity

Change-Id: I2ab6bd7231aae38a847c809e74f1374c9ddcb8ce
Signed-off-by: Steve Spear <steve.spear@openpeak.com>
Statusbar: Allow network stats to participate in lights out mode

Change-Id: I424f9382ed502b15ab243a9ba5a80c37285bce38
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Updated Simplified Chinese translations

Change-Id: Ia9c7215850ed3b55f2ce821187f51dafa71dc130
FW: remove hardware rebinding reboot requirement

*updateSettings() is called onChange, so update the
 key assignments when updateSettings is called.

Change-Id: I0cf5ff6dfc7abee782aa56c8c95f8a9f19f99494
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "Updated Simplified Chinese translations" into kitkat
SystemUI: fix usb tether toggle not updating its state

added missing permission android.permission.CONNECTIVITY_INTERNAL

Change-Id: Ic0b2dad01c5b5d53a17b7996e3c3324538a5a411
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "Statusbar: Allow network stats to participate in lights out mode" into kitkat
Toggles: fix logic to check if usb tether is active

Change-Id: I703f2f14e3587620c44df5bf0f7030a9fe3c0041
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
FW: Remove Rambar shadow

This just doesn't look like its supposed to be here...

Change-Id: Id4c979d43c7a22210283a7beaea3e71829833b46
Signed-off-by: Andrew Warfield <hiasant@gmail.com>
Keyguard: bring back longpress unlock

This will readd the possibility to unlock the device by
longpressing the lock icon when widgets are maximized.

Change-Id: I8dba1ed49a4731ba388ab9ee050cf56925d678a0
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
UsbDeviceManager: Fix race condition entering USB accessory mode

When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete.  There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.

To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.

Bug: 12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
FW: Enable nav bar for devices with hardware keys

Change-Id: I2704e99571deff62523da8113971096f79d14fc9
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge "Keyguard: bring back longpress unlock" into kitkat
base: Add battery level around unlock handle [1/2]

PS2:
added missing change in KeyguardSelectorView.java

Change-Id: Ia4dbc2335657c096c34349ec67c4adfec0aeb91b

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
Import translations. DO NOT MERGE

Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import