Merge commit 'c92f3bcd556be6086aabcdcf437cc29c2ac605f6'
* commit 'c92f3bcd556be6086aabcdcf437cc29c2ac605f6':
dumpstate: Pick up the last kernel log from /proc
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 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9'
* commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9':
Store info in the bookmarks/history database on whether it was a manually entered url.
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 '110a4675bef2fe11b2d38057def74d681fe7cca5'
* commit '110a4675bef2fe11b2d38057def74d681fe7cca5':
Set more camera parameters initial values.
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 '78b0e0b8feab377e44ff01471fa9ca8e1516fb65'
* commit '78b0e0b8feab377e44ff01471fa9ca8e1516fb65':
Add a new priority for Auto Connection of A2DP.
Merge commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3' into eclair-mr2-plus-aosp
* commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3':
Add a new priority for Auto Connection of A2DP.
Merge commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693'
* commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693':
Add a test app that will drain the battery. NOT IN BUILD.
Merge commit '85a9498a2f33d62a4313a3561b5468456974696e'
* commit '85a9498a2f33d62a4313a3561b5468456974696e':
Improve the exception message text by including eglGetError().
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 '03c185bf763fd2a289131d64e4b14d4a5461d80f'
* commit '03c185bf763fd2a289131d64e4b14d4a5461d80f':
Update documentation: The width of the image for face detection must be even.
Merge commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4'
* commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4':
More elimination of Formatter (I was tired of waiting several
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2
* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
Improve the exception message text by including eglGetError().
Merge commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa' into eclair-mr2-plus-aosp
* commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa':
Update documentation: The width of the image for face detection must be even.
Merge commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5' into eclair-mr2-plus-aosp
* commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5':
More elimination of Formatter (I was tired of waiting several
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'
* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
Change the DropBoxManager API slightly (this is public, but not yet released) --
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp
* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
Change the DropBoxManager API slightly (this is public, but not yet released) --
* changes:
Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610'
* commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp
* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp
* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
close file descriptors passed to drop box
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp
* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
Remove HardwareService and move vibrator support to VibratorService.
