Import translations. DO NOT MERGE

Change-Id: I40c2ddb772ada7175a84bc6c3b91eb9527901654
am 2fe1f4f7: More detailed verbose log from contacts provider

* commit '2fe1f4f757a84cb76382c375ba3755a802c5e444':
  More detailed verbose log from contacts provider
am 86f3922c: Merge "Remove never used SocialProvider and activity table" into jb-dev

* commit '86f3922c73cc76a8b69b341dcd098517bb55837e':
  Remove never used SocialProvider and activity table
am 2b362f7d: Don\'t allow backing up contacts storage

* commit '2b362f7d8dd037dabe821e282e8a49b63f501802':
  Don't allow backing up contacts storage
am 69ec3afd: Merge "Move CancellationSignal to android.os package." into jb-dev

* commit '69ec3afd0844994a8dd739279a55143e6437ae54':
  Move CancellationSignal to android.os package.
am af3fc698: Handle blob in dumpCursor

* commit 'af3fc698cbf359f17ae658b6f1e2088472662937':
  Handle blob in dumpCursor
am 76afa00c: Don\'t wait for read access latch in provider.getType()

* commit '76afa00cde0c8d407abf3597359280372fd85d41':
  Don't wait for read access latch in provider.getType()
am 5383d4a1: Reconcile with jb-release nakasi-factoryrom-release

* commit '5383d4a1f34e3160f932888d2187d0a384a6243b':
  Revert ""Rollback" mimetype cache"
am f83a3270: am f70a7ec9: Updating launcher icon to fix alignment. Bug:  6511716

* commit 'f83a32706b32dda519e7b308839a496d628be482':
  Updating launcher icon to fix alignment. Bug:  6511716
am 2038ce86: Reconcile with jb-release

* commit '2038ce86dc13bff315fa2ec1044a58ddc1f3183b':
Import translations. DO NOT MERGE

Change-Id: I16c7f62eaa31395d1567a0a8857fb1280ec82ab5
am 64ee95a3: am a499a2ad: Merge "Fix aggregation exception problem"

* commit '64ee95a3e48d6f83e338764650c53a915b778cdf':
  Fix aggregation exception problem
am fa078d35: am 4c3a0457: Support new query parameters introduced in Iaab5c38a

* commit 'fa078d353c83d7739d7e175af418a255e837fe92':
  Support new query parameters introduced in Iaab5c38a
am 7691772c: Reconcile with jb-release

* commit '7691772c14f7f2f632b04b8149e4b96d5cae3b67':
Fix transaction handling in the provider

Fixed issues that will happen when a batch operation for applyBatch()
contain operations for both the contacts db and the profile db.

- Make sure to set the right transaction listener when starting a transaction.
There were cases where we started a transaction on the contacts db but passsing
the profile provider as the listener, and vice versa.

- Make sure transaction callbacks operate on the correct DB.
There were cases where ContactsProvider2.onCommit() and its sbilings would
operate on the profile DB, not on the contacts db.

- Change the transaction finishing order.
When we start transactions on both the contacts and the profile DB, we do so
on the contacts db first, and then on the profile db.  But when we clsoe them,
we did it in the same order, which could potentially cause a deadlock.
Now we close them in the reverse order; the profile db first, then the
contacts db.

- Remove mActiveDb.
This wasn't set in switchTo{Profile,Contact}Mode(), but was lazily initialized.
But I wasn't too sure if I always set the right db at the right timing.
Looks like I forgot to do so in a few cases.  Let's just remove it and always
explicitly get the database from the current db helper.

Bug 6250673

Change-Id: Idd18fc173596c973d0ff8b6e1b2456715c0f14f8
Replace transparency with white for all pictures

Bug 5261517

Change-Id: I6c16bb1f9897589beec222fc63ad899cd478b923
Merge "Replace transparency with white for all pictures"
Reorganize import in contacts provider

Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
am 5a2cfba2: am 084a9d5e: Don\'t sort contacts supplied to global search app.

* commit '5a2cfba2623b8606ec5eb1a8e443957da2495e84':
  Don't sort contacts supplied to global search app.
am fb3ded27: Reconcile with jb-release

* commit 'fb3ded27d3e7c4d8c820b90b18bf716a9921af02':
  Don't sort contacts supplied to global search app.