Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp
* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp
* commit '562124e84d8ae63b614b14ba257680571091ef1f':
Clean up some style in the makefiles.
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp
* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
The ICU data is no longer compiled directly into the shared library.
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp
* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
Skip hostname verification when using insecure factory
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread
* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
Skip hostname verification when using insecure factory
moved surfaceflinger, audioflinger, cameraservice
all native services should now reside in this location.
Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp
* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
Argh oops I didn't mean to delete this.
Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp
* commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06':
first step at implementing the native sensor support
Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp
* commit '38eea8bf990540360b45b963195a7766c30b55d2':
Remove the YV16 format for simplicity's sake.
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp
* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
Download manager support for file URIs + last modified time
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp
* commit '97eb728aef51646b86925557a36732598e3fbaa1':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
in this commit:
- implemented the C stub
- implemented the binder interfaces involved
- implemented most of the C++ client side
missing:
- SensorManager cannot connect to the SensorServer yet
(because there is no SensorServer yet)
Change-Id: I75010cbeef31c98d6fa62fd5d388dcef87c2636b
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp
* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
Fix deadlock when switching between two GLSurfaceViews
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp
* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
IME events are now dispatched to native applications.
And also:
- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
around the IME or status bar).
There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.
Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
