am 2e6e5ef7: (-s ours) am c391e782: (-s ours) Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE

* commit '2e6e5ef77762f9f5bca72bf42842a5aa1baa2953':
  Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
am d2fbc57a: Reconcile with ics-factoryrom-release

* commit 'd2fbc57a904aa88c9b79b1c34d6e2f5520a2ad78':
  Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
am e4aeb840: Reapply: Fix for bug 5226268 [Browser] http keep-alive

* commit 'e4aeb840e5cd2acd20cf6b18af808af55a92e745':
  Reapply: Fix for bug 5226268 [Browser] http keep-alive
am 9306e92a: Use notable values when clearing Thread::startup_data_ to help with debugging

* commit '9306e92a0b28f7c70a3e29272141b0e271452479':
  Use notable values when clearing Thread::startup_data_ to help with debugging
am 28480d4f: Add more logging to Thread and WaitableEvent to help debugging

* commit '28480d4f48373da735986b2a75e099d3cfddab3e':
  Add more logging to Thread and WaitableEvent to help debugging
am d0a07ba4: More logging in Thread to help debugging

* commit 'd0a07ba49f88f1e331ac5fd80f30c81d975ebd12':
  More logging in Thread to help debugging
am 47f5154a: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafe

* commit '47f5154a4217fb3626326224fc1c7d3c9918dd09':
  Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
am e3b44106: (-s ours) am 08712c35: (-s ours) Remove temporary debug logging - DO NOT MERGE

* commit 'e3b44106f63aebd3a6e753bdebe4962455d5fcb9':
  Remove temporary debug logging - DO NOT MERGE
am 7d980efe: am df5ec85c: Merge "Causing webviews to hang." into ics-mr0

* commit '7d980efe6a2f9473c310a16bed689819ff3dee62':
  Causing webviews to hang.
am 8d1e40fa: am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafe

* commit '8d1e40fa83064d70b192f1b5aed95b8fc24e4cac':
  Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
am eaa86de4: Remove temporary debug logging

* commit 'eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc':
  Remove temporary debug logging
am cd7ce18e: Part of fix for bug 5455901 adding net_export.h

* commit 'cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0':
  Part of fix for bug 5455901 adding net_export.h
am a3fef89e: Part of fix for bug 5455901 Export symbols in android/

* commit 'a3fef89eb00853adb6524ab3d11c60f754f08b09':
  Part of fix for bug 5455901 Export symbols in android/
am 25577496: Part of fix for bug 5455901 Export symbols from net/

* commit '2557749644f9d25af9721533322db19197c49b49':
  Part of fix for bug 5455901 Export symbols from net/
am a1fe9c04: Part of fix for bug 5455901 Add exports needed for autofill and cookies

* commit 'a1fe9c0450e6d56112949b33ef2f7491e0cf0f60':
  Part of fix for bug 5455901 Add exports needed for autofill and cookies
am 41543423: Part of fix for bug 5455901 Export symbols from base

* commit '4154342345fc67972570f59528233826cd397f1e':
  Part of fix for bug 5455901 Export symbols from base
am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting everything

* commit '9fb7297dd54aca7ba646ee27608529f33634a7b2':
  Part of fix for bug 5455901 Fix makefile, turn off exporting everything
am b54fbb0d: Fix for build break

* commit 'b54fbb0d9cf6451f1683823838b6c0d2b345ed4b':
  Fix for build break
fix for bug 5454586, fix up getDbThread()

Creating a LazyInstance and removing getter function, just
using the object that should now be thread safe.

Minor indenting change.

Change-Id: I9deca3f10d96fdaf655a28b8f4d8db8efdc1803a
Merge "fix for bug 5454586, fix up getDbThread()"