tree 2ed04c7a0c327d31e8b396e83ac2ad672fd805df
parent bf78f00a78317c7d7684daf4d09c7f51a397fbcf
parent 10daf3614077694a859f1d1cfe67afd5536f99c7
author Baligh Uddin <baligh@google.com> 1392410248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410248 +0000

am 10daf361: (-s ours) am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit '10daf3614077694a859f1d1cfe67afd5536f99c7':
  Import translations. DO NOT MERGE