tree 2c96617c56f74610e433fe8d96e7b13ae4dc57b3
parent 2f7f8b575cc4aa6627cdc55e597185246bdaf2fe
parent 3984dbb864a18bc844abfe8f229657c4787c4b3f
author Geoff Mendal <mendal@google.com> 1446650863 +0000
committer android-build-merger <android-build-merger@google.com> 1446650863 +0000

Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-b-dev
am: 3984dbb864  -s ours

* commit '3984dbb864a18bc844abfe8f229657c4787c4b3f':
  Import translations. DO NOT MERGE