tree 9b1c6cc822ebc60c88ceb56b26b371e2ff50b81c
parent 153281e5a15c9fa4db08dace265eb6556216066f
parent 1005a3d5741b7e529beefb05b24d3cbd70543b53
author Geoff Mendal <mendal@google.com> 1424982273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424982273 +0000

am 1005a3d5: (-s ours) am 4914bbf7: (-s ours) Import translations. DO NOT MERGE

* commit '1005a3d5741b7e529beefb05b24d3cbd70543b53':
  Import translations. DO NOT MERGE