Merge commit 'ea4e597a87b51b8ec19798f3fdedf74a723d75d8' into HEAD

* commit 'ea4e597a87b51b8ec19798f3fdedf74a723d75d8':
  Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https.
Merge (-sours) commit '8a9e7a1f9490dc0c103c82fac74087459ddf4c16' into HEAD

* commit '8a9e7a1f9490dc0c103c82fac74087459ddf4c16':
  Fix for deadlock between StatusBarService and NotificationManagerService
Merge commit 'f468700b6dd02cf68d4424567a8288a24084f51a' into HEAD

* commit 'f468700b6dd02cf68d4424567a8288a24084f51a':
  checkpoint animations
Merge commit 'abf9943704f4f71c619d27e0de5f68afdaab5e3b' into HEAD

* commit 'abf9943704f4f71c619d27e0de5f68afdaab5e3b':
  Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend
Merge (-sours) commit '7fbddb1db1beeac7c6762fb7a11612e348f6ff90' into HEAD

* commit '7fbddb1db1beeac7c6762fb7a11612e348f6ff90':
  Refactor in PositionTesterContextMenuListener.
Merge (-sours) commit '56ccaa083872c159bf74f1c6342dcef73ea2eb77' into HEAD

* commit '56ccaa083872c159bf74f1c6342dcef73ea2eb77':
  Making it possible to determine which TTS engine is currently set as the default by the user.
Merge commit '3d31bb111a5f4052e189722d73bbfc61bf474288' into HEAD

* commit '3d31bb111a5f4052e189722d73bbfc61bf474288':
  Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
Merge (-sours) commit '54df9de49454a5b403f87d6b8aa6746b7b2c47a5' into HEAD

* commit '54df9de49454a5b403f87d6b8aa6746b7b2c47a5':
  Redesigned keyguard layout in the no-SIM case.
Merge (-sours) commit 'ffc3f8f40c7eff0bc3bb43f74a1a0e9235acb258' into HEAD

* commit 'ffc3f8f40c7eff0bc3bb43f74a1a0e9235acb258':
  Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider
Merge (-sours) commit '96a2b308d160e6dec07d75b518fac9aad4100cdd' into HEAD

* commit '96a2b308d160e6dec07d75b518fac9aad4100cdd':
  GpsNetInitiatedHandler: whitespace cleanup
Merge (-sours) commit '3bb65ee33b3001fe4100fe0779ad214d6898a465' into HEAD

* commit '3bb65ee33b3001fe4100fe0779ad214d6898a465':
  Redesigned keyguard layout in the no-SIM case.
Merge (-sours) commit '43e33f28721e4759d4edb0fad08d330bba74f25e' into HEAD

* commit '43e33f28721e4759d4edb0fad08d330bba74f25e':
  Move files internal to LocationManagerService from framework.jar to services.jar
Merge commit 'a03b19272bfcfc2bd161cb20d13b3bb65d5378c9' into HEAD

* commit 'a03b19272bfcfc2bd161cb20d13b3bb65d5378c9':
  Preflight before attempting to start network location and geocoder services

Conflicts:
	services/java/com/android/server/LocationManagerService.java
Merge (-sours) commit 'bf4650ca39c9153e38c76280ceb5e9af48b67751' into HEAD

* commit 'bf4650ca39c9153e38c76280ceb5e9af48b67751':
  According to GMail profile, almost half of WebView init time is spent in creating the zoomControl which is not used by them. So change to lazy initialize the ZoomButtonControl which will be used by Browser.
Merge commit 'c1d726c2d62424867ec14f2cde16b00fe0ddfee1' into HEAD

* commit 'c1d726c2d62424867ec14f2cde16b00fe0ddfee1':
  Seperate out Mutex and Signal code into reusable classes.
Merge (-sours) commit '288b4ac94571e6f77036831708e7bb7c31874688' into HEAD

* commit '288b4ac94571e6f77036831708e7bb7c31874688':
  Do a clean WifiWatchdog shutdown
Merge commit 'a70f416c9cf2fc6cc5e132c1d656ce07441d6b82' into HEAD

* commit 'a70f416c9cf2fc6cc5e132c1d656ce07441d6b82':
  Checkin new types for RS.
Merge commit '2d71bc7b4c46a32cead32a35e6e137d13e8315ea' into HEAD

* commit '2d71bc7b4c46a32cead32a35e6e137d13e8315ea':
  Update Script java classes and llvm samples.
Merge (-sours) commit '470cfb8e664a57c3deb6088354680e029a97bac9' into HEAD

* commit '470cfb8e664a57c3deb6088354680e029a97bac9':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge (-sours) commit '4a4f9886a789ece80f127397c1c7ad7f543b78fa' into HEAD

* commit '4a4f9886a789ece80f127397c1c7ad7f543b78fa':
  Use the content width to calculate the zoom overview width. We used to use the minimum preferred width to calculate the overview width as it is what we use to define the viewport width. But some sites, like cbsnews, engadget, the content width will be slightly wider than the viewport width decided by the min preferred width. The result is we can still scroll a little bit in the overview mode. This issue is magnified when we introduce the overscroll feature.