tree 3342f4ae7eaa3bd0698c4d81b6cd5d7069edfb36
parent c1a86f1de0acdd96eff071d8c3f7b5a5d9b53e6f
parent 80f2b5430e3a448d9c818e33ceff9cd674ecbbda
author Geoff Mendal <mendal@google.com> 1445921466 +0000
committer android-build-merger <android-build-merger@google.com> 1445921466 +0000

Import translations. DO NOT MERGE am: c338bacb59  -s ours am: 884a8bbe78  -s ours am: 436fcc47fc  -s ours
am: 80f2b5430e  -s ours

* commit '80f2b5430e3a448d9c818e33ceff9cd674ecbbda':
  Import translations. DO NOT MERGE