Merge commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc'
* commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '301eff069cbf086450af7a6e546acda20ca0055f'
* commit '301eff069cbf086450af7a6e546acda20ca0055f':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'
* commit '0d8aa05d306205850e3014550bce34735ac78660':
Add a privateImeOption to represent that the IME should not show
Merge commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e'
* commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc'
* commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc':
fix[2222341] Soft reset while going back from camcorder settings
Merge commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05'
* commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2
* commit '9efd523c4611c0cf10e712453a699c083a01064c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2
* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp
* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '148f666b0a10183afc987809482f18d8199d747c' into eclair-mr2-plus-aosp
* commit '148f666b0a10183afc987809482f18d8199d747c':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2
* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2
* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp
* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
Add a privateImeOption to represent that the IME should not show
Merge commit 'cbf583d7229aaff65734b4234e81db8ead864761' into eclair-mr2-plus-aosp
* commit 'cbf583d7229aaff65734b4234e81db8ead864761':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2
* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2
* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'd85545d0b4c92cceafafce98f246483de5c4903e' into eclair-mr2-plus-aosp
* commit 'd85545d0b4c92cceafafce98f246483de5c4903e':
fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2
* commit 'd01767f8b7038108f9125cd2122b117db9919824':
fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
Merge commit 'a823534008afa45f61faca4088c5aabe9b956117' into eclair-mr2-plus-aosp
* commit 'a823534008afa45f61faca4088c5aabe9b956117':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2
* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
