Merge commit '3975fe3f21311e41b41e3a3e234a45ca24bed521'
* commit '3975fe3f21311e41b41e3a3e234a45ca24bed521':
AI 148962: Default language in Switzerland should be german and not english.
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'
* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
Fix build breakage
Revise the ImageButton class description to include information
Record statistics about whether HTTP connections are reused.
Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut
* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
AI 148962: Default language in Switzerland should be german and not english.
Merge commit 'a0068514e7c60252a96fa7907ff976bef46b4c40'
* commit 'a0068514e7c60252a96fa7907ff976bef46b4c40':
libGLESv1_CM.so doesn't need to depend on libutils or libui
Merge commit 'd1a9337380cf9f40f1aa095457b11242d483295d'
* commit 'd1a9337380cf9f40f1aa095457b11242d483295d':
Add a new window flag to display a window when keyguard is shown.
Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4'
* commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4':
Change _TOKENIZE tests to test the new token_index column
Merge commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f'
* commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f':
Fix the build. :(
Implement compatibility support for WRITE_SDCARD permission.
JSR239 and android.opengl gl Pointer functions (glColorPointer, etc.)
now respect the current setting of the Buffer position.
This fixes a regression introduced when we started requiring the
Buffers passed to the Pointer functions to be direct Buffers.
Merge commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4'
* commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4':
Tear down data, if a disconnect request is pending.
Merge commit 'b3c6addfc17be2a52133026148f3928ab97c83cb'
* commit 'b3c6addfc17be2a52133026148f3928ab97c83cb':
Fixes#1855461, #1857290 and #1857365. Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'
* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
Merge commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727'
* commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727':
Add the backup data file writer C++ class.
* changes:
Fixes#1855461, #1857290 and #1857365. Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
* changes:
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
