tree 7737ed8c81a2fe63f70ba9ce2f76e078c4e55302
parent 58f25796ca3f9f73f1b1a2241c65aa2682a55fa1
parent 3f2ece6ceae3923dca0d54b2e65fa16e79e3752c
author Geoff Mendal <mendal@google.com> 1421106301 +0000
committer android-build-merger <android-build-merger@google.com> 1421106301 +0000

am 04250824: (-s ours) Import translations. DO NOT MERGE
automerge: 3f2ece6  -s ours

* commit '3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
  Import translations. DO NOT MERGE