refs/heads/marshmallow-mr1-dev - platform/packages/apps/UnifiedEmail

commit: a4d171f3b810567d6c60ae02ff1564b15ba75a94
[log]
author: Geoff Mendal <[email protected]>
Wed Jul 15 21:43:27 2015 +0000
committer: Android Git Automerger <[email protected]>
Wed Jul 15 21:43:27 2015 +0000
tree: 8c3608027aad02059228f84c658d8a9bac6c7987
parent: ad5289cd0fcf034fe43c9ffd485aa434424bd8f7 [diff]
parent: 76d7877cb306f0c964a1a7e30c9a41267b996670 [diff]

am 76d7877c: (-s ours) Import translations. DO NOT MERGE

* commit '76d7877cb306f0c964a1a7e30c9a41267b996670':
  Import translations. DO NOT MERGE

tree: 8c3608027aad02059228f84c658d8a9bac6c7987