merge in ics-mr1-release history after reset to ics-mr1
Always show appropriate mobile service label.

Fix for Carrier Verification case failure for not showing
"no internet connection" text on expanded status bar while
mobile data connection is not CONNECTED state.

Bug:5884774
Change-Id: I433d5de626b9b0cff20d192cb6aae214f3e014b3
framework: Add a version of Environment.getExternalStorageState which accepts a path parameter

Required for improved media scanner on devices with emmc

Change-Id: Id215238f3503221b06459dfa241c2c52ea6a0baa
Fix issue #5823276 again: home repaints after full-screen app is exited

Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.

This fix does not include the change to ignore app tokens that are
hidden.  This causes problems in some dialogs that stay hidden until
their app is ready to display, but need to perform a series of relayouts
during that time to get to the right size.  Dropping this part of
the change still (mostly?) seems to allow us to avoid the bad states.

Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
Merge "Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)" into ics-mr1
Merge "Implement a max time bound for rotation.  (DO NOT MERGE)" into ics-mr1
Merge "Always show appropriate mobile service label." into ics-mr1
Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
Added NFC Reader support for two new tag types:  ISO PCD type A and ISO PCD type B

Change-Id: I61ddaff20128199776bab93a2eeb1e7f0f8feea7
New out-of-service RSSI.

This creates (well, restores, since we had this until
Honeycomb) a user-visible state for "no service" that is
distinguishable from "very very weak service" (less than one
bar).

Bug: 5775939
Change-Id: Idd08b1a9411d5d94e4d7a97fa7f3ffd92b8113a6
Merge "New out-of-service RSSI." into ics-mr1
Hide mobile RSSI on devices without mobile data.

Also fixes some minor layout glitches along that row of
icons (Bluetooth vertical alignment & spacing, battery text
width, inter-icon padding).

Bug: 5895226
Change-Id: I303c2899bf21ddb7e28914d8fb36efd7090ac5e2
Fix 5797764: Increase lock screen's thread priority

This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
Update WiMAX assets to match new style
Bug: 5724605

Change-Id: Iab24c3e5aad3af38d5ba3a5a8f383c79270bdea3
Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Fix 5797764: Increase lock screen's thread priority

This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
Remove double qcom ifdef

Change-Id: Ia3957c3a841d051207faa41113c53911af431cb6
DexOpt anything on /system in /cache/dalvik-cache

Allow property to disable dexopt on /cache

(cherry-picked commit e2319e46f16b71e71e5e9cd593019edaa48c1be0)

Conflicts:

	cmds/installd/installd.h

Change-Id: I79e5de4b466c6b5175145592f1ca4e6331e4a4ac