commit | c5d183458c13a0d780aee93f256ea5dc6b22f815 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 11 16:32:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 16:32:04 2015 +0000 |
tree | 24b1d70cb11080e6ee434de5449a32385eb47e7e | |
parent | cf80d7c4f03f8c55963b4815c1b7004d77cb9e5b [diff] | |
parent | cdf00b1640bc621d513dcb965f44a4ace8bacece [diff] |
am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE * commit 'cdf00b1640bc621d513dcb965f44a4ace8bacece': Import translations. DO NOT MERGE