tree b832f95fc27e23a16e5be58e43c18ba78e5ac9e5
parent c74af11c4805cdc1ce48ce19ef521d660d4c7ed3
parent 0da76f35378677f1102e0be218ce1993c0e528b6
author Baligh Uddin <baligh@google.com> 1380139825 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380139825 -0700

am 0da76f35: (-s ours) am d820f294: (-s ours) Import translations. DO NOT MERGE

* commit '0da76f35378677f1102e0be218ce1993c0e528b6':
  Import translations. DO NOT MERGE