commit | 54911d7670f3149ca7a554e8eef920fa88eaba45 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 30 18:47:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 30 18:47:02 2014 +0000 |
tree | 583384b804ececa7b083be05db6c2add97f6c15d | |
parent | 47f2d442e7d776b5debeed25caa1e9eb2fdc0311 [diff] | |
parent | 2969b23992dff27bdd5ef103dc4cf374b14ddf11 [diff] |
am 2969b239: (-s ours) am 9d809918: (-s ours) am 5d49fbcf: (-s ours) am ed459a8f: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGE * commit '2969b23992dff27bdd5ef103dc4cf374b14ddf11': Import translations. DO NOT MERGE