commit | ecc5002a248e4d360b5c90c03abe1e4dd65ec5ad | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed May 14 16:31:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 16:31:20 2014 +0000 |
tree | bc2f55d515f28a12564be11df8e8a114e3a18792 | |
parent | 12d7686a4de64490432af576d7b6b1db3e128e3d [diff] | |
parent | ffc573b1ab8dcf6f258ad12afbaf586001b2e2d4 [diff] |
am 3b359adf: (-s ours) am 1295b4ec: (-s ours) am e0dad508: (-s ours) am a2a415ba: (-s ours) am ac1afdc9: (-s ours) am 6a546a12: (-s ours) am 99425be2: (-s ours) Import translations. DO NOT MERGE * commit '3b359adf393be2a9de985e6506547e0ac42eb1c7':