tree 29b40c9b7e48ae91e3092542d6b241f9fb887691
parent efeaa6b4377c7e4b48eb4c05a0c2be4c649e6989
parent bf52c9ff2298b2c2c8a4a0a1ae2e822e13347f52
author Geoff Mendal <mendal@google.com> 1430118970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430118970 +0000

am 694a55b6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '694a55b67ba865e48b8b0e281d64ab63145abdae':
  Import translations. DO NOT MERGE