Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp
* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp
* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread
* commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee' into gingerbread-plus-aosp
* commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee':
Periodically scan wifi when wifi is not connected and wifi lock is
Merge commit '0a6e717fb6846f66b8dc853e079f2166307bfc60' into gingerbread-plus-aosp
* commit '0a6e717fb6846f66b8dc853e079f2166307bfc60':
Handle dialing a SIP call to self.
Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation
Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp
* commit '1858031946b3627b599475c5894655362e510351':
DO NOT MERGE. Turn down backup logging for release.
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp
* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp
* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
Fix some camera orientation javadoc errors.
Merge commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d' into gingerbread-plus-aosp
* commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d':
Fix the incorrect environment variable name for the thread pool size.
Merge commit '453c6d449b6469dde9aae6044dedfe3be0da76c5' into gingerbread-plus-aosp
* commit '453c6d449b6469dde9aae6044dedfe3be0da76c5':
add api level 9 'since' flag to docs
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp
* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
StrictMode: fix docs to actually compile and add a utility method.
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp
* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
Don't force ended when full screen video is returned manually.
Merge commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce' into gingerbread-plus-aosp
* commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce':
Cleanspec to fix incremental build failures of the form:
Merge commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747' into gingerbread-plus-aosp
* commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747':
GPS: Enable some more logging
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp
* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
Fix bug where home presses were not poking user activity.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp
* commit 'd68cda472a3646966a203338ccac04f0783293b7':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
We now poke user activity twice: once upon dequeueing an event
for dispatch and then again just before we dispatch it. The second
poke is to compensate for the fact that it can take a few seconds to
identify the dispatch target (if the application is responding slowly)
but we want to keep the display from going to sleep for X amount of time
after the app gets a chance to actually receive the event. This mirrors
pre-Gingerbread behavior.
Removed some unnecessary code that filters user activity pokes when sending
events to KeyGuard. We don't need this because KeyGuard already tells the
power manager to disable user activity.
Bug: 3101397
Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp
* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
DO NOT MERGE Add additional options and receiver to BT tests
Merge commit '382717f3eeca1a21e9756c7de42b4d31747d1675' into gingerbread-plus-aosp
* commit '382717f3eeca1a21e9756c7de42b4d31747d1675':
Set the thread pool size of NIST sip stack to one.
