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
merge in nakasi-factoryrom-release history after reset to jb-dev
am 76afa00c: Don\'t wait for read access latch in provider.getType()

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

Change-Id: I3f9209c52b692c09816e1ba82c722ea8d84d75ab
am 5383d4a1: Reconcile with jb-release nakasi-factoryrom-release

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

* commit 'f70a7ec9de84f09f5fc71e656f8419af5a925940':
  Updating launcher icon to fix alignment. Bug:  6511716
am f83a3270: am f70a7ec9: Updating launcher icon to fix alignment. Bug:  6511716

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

Change-Id: I1a96178bf84a7d3611149411dad003605bd87562
am 2038ce86: Reconcile with jb-release

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

Change-Id: I16c7f62eaa31395d1567a0a8857fb1280ec82ab5
Fix aggregation exception problem

This patch fixes a bug in the aggregation algorithm. When adding
aggregation exceptions sometimes when excluding a raw contact from
a Contact the contact information was not updated.

Change-Id: If527c0fe0bd51eec77a71e466492691375889037
Merge "Fix aggregation exception problem"
am a499a2ad: Merge "Fix aggregation exception problem"

* commit 'a499a2adb856223de65d298cd93d70c85afe3d4d':
  Fix aggregation exception problem
am 64ee95a3: am a499a2ad: Merge "Fix aggregation exception problem"

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

* commit '4c3a04572ead6ad9f0cfc20a34db3252fdb31201':
  Support new query parameters introduced in Iaab5c38a