Merge commit '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '55a76dd8d9996c1e93762d7611789aea696d536c':
fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).
Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.
Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
Merge commit '3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp
* commit '3fb627525e077fa5452a99ac1e2a7e9c41995044':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread
* commit '392edec1162e9d00bcb66b271f43908f75d42ace':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp
* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
Merge commit '31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp
* commit '31b5d5485f7336639d252da7ba979234dbd2f1e1':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp
* commit '571180c4c72e0bb4f930f8971edf000a652f10f6':
Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().
Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp
* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp
* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
Merge commit '493941b8d8a12ee843d9823c0177f8005a7be54f' into gingerbread-plus-aosp
* commit '493941b8d8a12ee843d9823c0177f8005a7be54f':
Allow creation of an audio effect on a session with no audio tracks.
Merge commit '7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp
* commit '7b40518e56a3238b28b24a786a2ff22d5a425765':
Change unistd.h to stddef.h to be correct
Merge commit '5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp
* commit '5f866a4ac389a18613180b056d946ae5a7b84e10':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp
* commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
Fix a bug that could cause flings to last too long using a Scroller
Merge commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp
* commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
