Import translations. DO NOT MERGE

Change-Id: Id04a447bff2aa2ef192bccdbb6f445a03706dcf0
Auto-generated-cl: translation import
am 2ebea8a0: (-s ours) Import translations. DO NOT MERGE

* commit '2ebea8a04142a9ed338fbb8e98eb27a869c0f223':
  Import translations. DO NOT MERGE
am ee32193f: (-s ours) am 2ebea8a0: (-s ours) Import translations. DO NOT MERGE

* commit 'ee32193f1cb7feb38f2929847191282bdfdc1728':
  Import translations. DO NOT MERGE
Add null check for cursor in DirectoryListLoader

Bug: 12015142
Change-Id: Iaf7a97efb31e06402d583d399fa1f66f12e086d9
(cherry picked from commit 903c973e0ef995ee05acf8fa7501377afa971384)
Fix NPE when kind is null in getBestType

Fix alternate insertChild() method to detect and bail on null kind just
like primary insertChild() method does. Also change getBestValidType()
not to crash on null kind.

Bug:12490438
Change-Id: I82c351ccd5a880fb8bc71b5b27ffb2662c071be3
(cherry picked from commit 29a094106357ea806dc029437af77ec91b94cafb)
Fix NPE with null cursor

Fix NPE when get null cursor back from CP2 query.

Bug:12760164
Change-Id: I88ff0a9bd5b58a3e837c943bf999c8636b749b64
(cherry picked from commit 2148610dede65c774d95e2d44d7b742f1f08857a)
Fix potential NPE with null cursor

Detect and handle null cursors returned from CP2 queries.

Bug:12767708
Change-Id: I7bc4f97848a59140aba5a2c924c79fdc2749b150
(cherry picked from commit 23fe38b225346526e3f425570f3648dd7d893a5d)
Fix NPE if contactsCursor is null

Don't crash if the CP2 call failed and we were unable to load the
contacts cursor.

Bug:12822702
Change-Id: Ib6b3cf5a9519d61c82924f29babb146888f7453a
(cherry picked from commit 1f44ffc294764250cb1e02290fabdc439126dc19)
Fix Contact photo flicker in People and Dialer

Bug: 11634428
Change-Id: Ied6f6dcfe8ae905e6223973d32fb64406ca085a9
(cherry picked from commit 2105200e6414a7a35596f792af08a8841333a41d)
am 3c3b30f7: Add null check for cursor in DirectoryListLoader

* commit '3c3b30f7b4ab6dc0355df56fa59278e53cad8807':
  Add null check for cursor in DirectoryListLoader
am e3e3d6bb: am 3c3b30f7: Add null check for cursor in DirectoryListLoader

* commit 'e3e3d6bb52bef329e6aac6d052527d93a4d706a0':
  Add null check for cursor in DirectoryListLoader
Merge "Fix NPE when kind is null in getBestType" into klp-dev
am 1c269da0: Merge "Fix NPE when kind is null in getBestType" into klp-dev

* commit '1c269da02e12d1c9eb2b7aa82e6cea2725321dd2':
  Fix NPE when kind is null in getBestType
am 98c4d6eb: am 1c269da0: Merge "Fix NPE when kind is null in getBestType" into klp-dev

* commit '98c4d6eb8a73d0c907586c297e35aa2502637a2a':
  Fix NPE when kind is null in getBestType
Merge "Fix NPE with null cursor" into klp-dev
am 1dbf752d: Merge "Fix NPE with null cursor" into klp-dev

* commit '1dbf752d4361a1701996f83a4d91edb75f2ea633':
  Fix NPE with null cursor
Merge "Fix potential NPE with null cursor" into klp-dev
am b8dfb782: am 1dbf752d: Merge "Fix NPE with null cursor" into klp-dev

* commit 'b8dfb78252c8085ba680301c45f8786d04e5e3fc':
  Fix NPE with null cursor
am ea87977e: Merge "Fix potential NPE with null cursor" into klp-dev

* commit 'ea87977e2d785075b77f40e5f14ffdf3968bda0b':
  Fix potential NPE with null cursor
am 5541fc20: am ea87977e: Merge "Fix potential NPE with null cursor" into klp-dev

* commit '5541fc209f974a20647112de5d43ce32cec6c5eb':
  Fix potential NPE with null cursor