tree a2a7056d4f2dafc6b3eb7ee27898030484791f10
parent 47a319fea0c4141330b13d5286f58dc69892aa54
parent 24d462d71ea2b2698af5d452cb1c9f74f0332c7b
author Geoff Mendal <mendal@google.com> 1457961256 +0000
committer android-build-merger <android-build-merger@google.com> 1457961256 +0000

Import translations. DO NOT MERGE
am: 24d462d71e  -s ours

* commit '24d462d71ea2b2698af5d452cb1c9f74f0332c7b':
  Import translations. DO NOT MERGE