Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp
* commit 'cce0cd138dd0dc338db59083052aca01a51bd52d':
Looper: use pthread_once for TLS key initialization.
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation
Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).
Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp
* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
This log message is codec specific.
Merge commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e'
* commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e':
Un-@hide ability to download without a running notification.
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp
* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
Un-@hide ability to download without a running notification.
Merge commit '447c677e97e90344881371ecef1ec8aca1b3acc0'
* commit '447c677e97e90344881371ecef1ec8aca1b3acc0':
DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
Merge commit '1139b326d2cf95e2917ed23d79f795d64379d188' into gingerbread-plus-aosp
* commit '1139b326d2cf95e2917ed23d79f795d64379d188':
DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
Merge commit 'f1166513f596c4ffad41429b10ba1d20c65f6d6c'
* commit 'f1166513f596c4ffad41429b10ba1d20c65f6d6c':
Support for download manager "queue for wifi" dialogs
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp
* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
Support for download manager "queue for wifi" dialogs
Merge commit 'b745ec954272a3c09cca354ad84e2e08b54c8544'
* commit 'b745ec954272a3c09cca354ad84e2e08b54c8544':
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp
* commit '173ea0912af296c6e80d14b764046534b316d21f':
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
Merge commit '100cc263b465242c01dc9eb280d77ffaadbddd39'
* commit '100cc263b465242c01dc9eb280d77ffaadbddd39':
Do not merge : cancel text select mode when pressing back, etc.
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp
* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
Do not merge : cancel text select mode when pressing back, etc.
Merge commit '7e8a16e884632c85a54dc351c0b4f79aea116237'
* commit '7e8a16e884632c85a54dc351c0b4f79aea116237':
Allow record to set input color format as a command line option
Merge commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063'
* commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063':
recovery just takes a filename as an argument now (do not merge)
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp
* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
Allow record to set input color format as a command line option
Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp
* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
recovery just takes a filename as an argument now (do not merge)
