tree 028142c4610fb22333e5bd290c32499e20f4ca6e
parent e5cd063305abe8a0d451f45d9690ef42db7768eb
parent 293336c3f4f0a33df60fa6a53977bccc9c133d76
author Baligh Uddin <baligh@google.com> 1381506065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381506065 -0700

am 293336c3: (-s ours) am b7c63fa4: (-s ours) Import translations. DO NOT MERGE

* commit '293336c3f4f0a33df60fa6a53977bccc9c133d76':
  Import translations. DO NOT MERGE