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
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
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 '45dc4f82a00e52b12389b22a7cfbbee5609e8e28'
* commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28':
Allow creation of an audio effect on a session with no audio tracks.
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 '6487ade97ae4ad801681c866c846ed8862454ec4'
* commit '6487ade97ae4ad801681c866c846ed8862454ec4':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp
* commit '5f866a4ac389a18613180b056d946ae5a7b84e10':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0'
* commit 'c6d83cafed6e60223c28da328f845998e27bfae0':
Fix a bug that could cause flings to last too long using a Scroller
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 '9362ea760f565389f5accce7e17476d05510ed59'
* commit '9362ea760f565389f5accce7e17476d05510ed59':
fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
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.
