tree c57790058f0da12c23063a496dc3b47ff19ca268
parent c782e735d3b806ab117572e77cc4c9e4cf73b4ea
parent e713ca293e3c20c66cf2a0bcee6e015443f18e1e
author Baligh Uddin <baligh@google.com> 1348757230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348757230 -0700

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

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