Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp
* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
add ART for inet connection condition
In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor
can not be rewinded isShareable should be set to false.
Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp
* commit '506d724cc356a7ba73995ef2929c65062277c83d':
DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp
* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
Always set the scheduling group when starting a new thread.
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp
* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
Add toast when an app intercepts the launch of another app.
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp
* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
Small fixes to battery stats.
The activity manager looks for cases where one app launches immediately
after another. If this happens, a brief toast is shown telling the user
when app is actually running and what was originally starting.
Change-Id: If94cf5bd393dd0bc0f09789dae044fde1386c481
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp
* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
Remove the use of FileInputStream.available()
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp
* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp
* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
Only pulse notification light if a new notification has been received since the screen was last turned off
Merge commit 'a79c82918e3df38197cd4c81d10049401485036e' into gingerbread-plus-aosp
* commit 'a79c82918e3df38197cd4c81d10049401485036e':
Fix to get A2DP to connect after unpairing
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp
* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
Fix for an IndentOutOfBounds in TextField.
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp
* commit '87e215fd54559935649fb07264ece600bbabbdf9':
Made context menu appear when tapping inside selection.
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp
* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
Hidden API to control sorting of download manager queries.
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp
* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
Fix a few typos in EGL wrapper
This change adds a hidden API to sort download manager queries by size
rather than by time last modified. This is necessary for the system
download manager UI but, in the interest of keeping the new public API
as minimal as possible for now, I'm leaving @hide on this method.
This change also changes the DownloadManager.COLUMN_ID column to be
identical to BaseColumns._ID, since some code relies on this (such as
CursorAdapter).
Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
