Merge commit 'a1414d1c5bd2c91571e83fb147c17996ec170555'
* commit 'a1414d1c5bd2c91571e83fb147c17996ec170555':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5'
* commit '528961a61d99280e67fbb13b78b3d2538c3025d5':
Handle expiration of discovery mode in system server.
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'
* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
When change from narrow screen to wide screen, we will
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'
* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'
* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
Add official assets for tabs in compatibility mode
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'
* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
Add auto-brightness mode to the list of backed-up settings
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'
* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
Fix 2146581: Make tabs work for donut apps
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'
* commit 'c321ab992d526cde098986d512ce4a051c486607':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
Merge commit 'c27d57182a5722aba51af700593852b4ab006653'
* commit 'c27d57182a5722aba51af700593852b4ab006653':
DO NOT MERGE: Cleaning up the PipedStreamTest
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf'
* commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf':
API XML changes to accompany dalvik.system deprecation.
Merge commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9'
* commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9':
egl: temporarily also include eglTerminate->eglInitialize hack for 8k
If layout id is specified for a Preference object, convertView is set to null
in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen.
Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
Merge commit '81384bf927c47a4efa653b14273084a13e67e3ac' into eclair-plus-aosp
* commit '81384bf927c47a4efa653b14273084a13e67e3ac':
don't emit GL commands when sf is in freeze mode
We were emitting GL commands, calling composition complete and releasing clients
without ever calling eglSwapBuffers(), which is completely wrong on non-direct
renders. This could cause transient drawing artifacts when unfreezing the
screen (upon orientaion change for instance) and could also block the clients
for ever as they are waiting for their previous buffer to be rendered.
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp
* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp
* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp
* commit 'dba93b68326f139f669aefa6770d50daff032746':
Check that playlist entries refer to a row in the audio table.
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp
* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
Add documentation about flash and change video-light to torch.
Merge commit '960972d465d6890d51c73fc08dda7fb17825ce7f' into eclair-plus-aosp
* commit '960972d465d6890d51c73fc08dda7fb17825ce7f':
Allways dump the list of allocated buffers when an allocation fails.
Merge commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb' into eclair-plus-aosp
* commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb':
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
* changes:
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
