am 0fe0c461: (-s ours) Remove deprecated locales

* commit '0fe0c461ba65fc645d304f83372aa94be50b707a':
  Remove deprecated locales
am afb8e40b: (-s ours) am f7b6b3e1: am 2ec96fe1: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'afb8e40bc6a248e73c632412b495176a2c531242':
Removing explicit destination for CALL intents sent from dialer.

Change-Id: I547d469e457397c9f9298b7f60da5324476affba
Import translations. DO NOT MERGE

Change-Id: I3068b8fb07c5de3506fd3a682310b0e3b1bd09f0
Auto-generated-cl: translation import
am 4ff55baf: (-s ours) Import translations. DO NOT MERGE

* commit '4ff55baf30c9a3d829576cf51526d1c14eddc036':
  Import translations. DO NOT MERGE
am ef3cf099: (-s ours) am 4ff55baf: (-s ours) Import translations. DO NOT MERGE

* commit 'ef3cf0998c91cd4c8b311418a97524a26336e183':
  Import translations. DO NOT MERGE
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
am 29a09410: Fix NPE when kind is null in getBestType

* commit '29a094106357ea806dc029437af77ec91b94cafb':
  Fix NPE when kind is null in getBestType
am 1f86df92: am 29a09410: Fix NPE when kind is null in getBestType

* commit '1f86df9288694d2f1870561f8ddd894c44079f8f':
  Fix NPE when kind is null in getBestType
Fix potential NPE with null cursor

Detect and handle null cursors returned from CP2 queries.

Bug:12767708
Change-Id: I7bc4f97848a59140aba5a2c924c79fdc2749b150
Fix NPE with null cursor

Fix NPE when get null cursor back from CP2 query.

Bug:12760164
Change-Id: I88ff0a9bd5b58a3e837c943bf999c8636b749b64
am 23fe38b2: Fix potential NPE with null cursor

* commit '23fe38b225346526e3f425570f3648dd7d893a5d':
  Fix potential NPE with null cursor
Merge "Fix NPE with null cursor"
am 8c4edfc3: am 23fe38b2: Fix potential NPE with null cursor

* commit '8c4edfc3d336268143cd72e5be75c51e7c383cb6':
  Fix potential NPE with null cursor
am 4c816100: Merge "Fix NPE with null cursor"

* commit '4c81610029b83e65afdfc418b812a267d492efd6':
  Fix NPE with null cursor
am 5f679670: am 4c816100: Merge "Fix NPE with null cursor"

* commit '5f679670398e901b1eb6913441ade7aa387ebf12':
  Fix NPE with null cursor
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
am 1f44ffc2: Fix NPE if contactsCursor is null

* commit '1f44ffc294764250cb1e02290fabdc439126dc19':
  Fix NPE if contactsCursor is null
Fix search crash

Trap NPEs thrown by CP2 query so faulty directory providers don't crash us.

Bug:12893832
Change-Id: Ie88aafb84b6d7129da02d6e0a4457ecfad5ca9b5
am ae961fff: Fix search crash

* commit 'ae961fff72fd6612ccad09c9aa63e5ebabd826ea':
  Fix search crash