Merge commit 'c711e06c1869b1e5be5b7a9826470564268328ac' into eclair-mr2-plus-aosp
* commit 'c711e06c1869b1e5be5b7a9826470564268328ac':
Import revised translations. DO NOT MERGE
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp
* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8' into eclair-mr2-plus-aosp
* commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8':
Fix a leak in WebView.
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp
* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2
* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
Import revised translations. DO NOT MERGE
Merge commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp
* commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
fix issue with plugin surfaces not updating properly within the view system.
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
* changes:
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Merge commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f' into eclair-mr2-plus-aosp
* commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f':
Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0' into eclair-mr2-plus-aosp
* commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0':
Cleanup how a plugin goes full-screen.
Merge commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c' into eclair-mr2-plus-aosp
* commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c':
Refactoring the logging interface to remove dependence on NPP.
Merge commit 'b292461c6791b6e6780085358a5ba15f688e70ba' into eclair-mr2-plus-aosp
* commit 'b292461c6791b6e6780085358a5ba15f688e70ba':
add --esn option to am to allow adding extra with a null value
Merge commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd' into eclair-mr2-plus-aosp
* commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd':
Refactoring plugins to use new java interfaces.
Merge commit 'e11a1b4d1a57dd6f42171aca3a4edb71438cbad1' into eclair-mr2-plus-aosp
* commit 'e11a1b4d1a57dd6f42171aca3a4edb71438cbad1':
dumpstate: Pick up the last kernel log from /proc
Merge commit 'f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-mr2
* commit 'f817218e09a556f20efc81309ba2cdb3475a370b':
dumpstate: Pick up the last kernel log from /proc
Merge commit '331c7788a84fc6f625ac1bafbb33cf7da1116407' into eclair-mr2-plus-aosp
* commit '331c7788a84fc6f625ac1bafbb33cf7da1116407':
Store info in the bookmarks/history database on whether it was a manually entered url.
Merge commit 'd82f452fdcfbaa057c5db3491417c49c86247970' into eclair-mr2-plus-aosp
* commit 'd82f452fdcfbaa057c5db3491417c49c86247970':
Set more camera parameters initial values.
We will need those values for new camera framework. And change the canned jpeg
image to match the new width and height setting.
Change-Id: I49f8fb63d2b859b9e9f1c5d27657a10203315bb6
Merge commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3' into eclair-mr2-plus-aosp
* commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3':
Add a new priority for Auto Connection of A2DP.
Merge commit '199d7bed1184985cdd1130b4ad1e79163a5c28cc' into eclair-mr2-plus-aosp
* commit '199d7bed1184985cdd1130b4ad1e79163a5c28cc':
Add a test app that will drain the battery. NOT IN BUILD.
Merge commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841' into eclair-mr2-plus-aosp
* commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841':
Improve the exception message text by including eglGetError().
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-mr2
* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
Add a test app that will drain the battery. NOT IN BUILD.
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2
* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
Improve the exception message text by including eglGetError().
