tree ee55a75ad8dd61305a4b705196ac5cdb2ca84920
parent 668037cd00132fd5156bdb17a323c8ad25749adc
parent d11aa867bc8aefc974eb188aeb0b98c1bde00a5e
author Baligh Uddin <baligh@google.com> 1381033036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381033036 -0700

am d11aa867: (-s ours) am b3c79fca: (-s ours) Import translations. DO NOT MERGE

* commit 'd11aa867bc8aefc974eb188aeb0b98c1bde00a5e':
  Import translations. DO NOT MERGE