resolved conflicts for merge of 51823db5 to master

Change-Id: Ic7d158747597d4049b29e9c6281bdab8bf345552
am e7f73ba1: am a1c8fb11: Merge "Move potentially blocking operation out of the activity controller." into froyo
am 1e1b24ba: am d6aae2e8: Merge "Cleanup framework test defs." into froyo
am 53d3371b: am 452de9c9: Merge "More test_defs cleanup." into froyo
 Making browser unit tests as continuous (as part of checking incremental code coverage). Right now we have about 18% of Browser code coverage.

Change-Id: I7bc47286fc6648c447f86eb1acfd7e47d5246d53
am d71605b0: am 8c63b97f: Rename framework-common testdef to android-common.
Rename the "Media Scanner" DevTool to "Media Provider", and add
functionality to insert random filler data in to the database.

Change-Id: I632c7c8fea8aceca7b71dab88f3b01ed7ae49a92
am 6c80d5e5: am 6cb5d6a4: Merge "Skeleton for tic-tac-toe sample." into froyo
am 1452e936: am c45224b4: Merge "Implementation of the tic-tac-toe sample." into froyo
am a60cf6db: am 4ce5771c: Merge "Project-lib sample: set namespace to com.example.android" into froyo
am 86c178a8: am 1fd241b3: Merge "Project-lib sample: externalize strings in lib." into froyo
am 78566df7: am 79a612b2: Remove com.android.quicksearchbox.tests from continuous.
am 7546e9ed: am 254f0e9b: Update SDK component source.properties.
am b3c0d6a1: am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo
Merge "Rename the "Media Scanner" DevTool to "Media Provider", and add functionality to insert random filler data in to the database."
am f8dc0be1: am 406ed04d: Merge "Backup/Restore sample application" into froyo
am 3bb112ae: am f617797e: Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo
am 79044b97: am 3356ba35: Merge "Add Backup/Restore sample to the SDK docs" into froyo
New testsuite for libjingle

Change-Id: I94336057a0edf3990614d41594f715de0898551a
Merge commit '6994e5540cff9abccc37040c0f79a89215efa6a6' into oxygen_4.3

* commit '6994e5540cff9abccc37040c0f79a89215efa6a6':
  Making browser unit tests as continuous (as part of checking incremental code coverage). Right now we have about 18% of Browser code coverage.