tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent e2ebab448a5c4db2a463f20222f238162c0e0c58
parent 8ddabcd098ede5cd6c5cef1e3b36e3982c50af03
author Baligh Uddin <baligh@google.com> 1412095088 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095088 +0000

am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

* commit '8ddabcd098ede5cd6c5cef1e3b36e3982c50af03':
  Import translations. DO NOT MERGE