commit | ce1ab8f234af392605e6b87743604cb318bc6ed6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 29 15:03:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 15:03:46 2015 +0000 |
tree | 8f26ebb86a0ca2214903fa2d4bcb5a49e3f350a1 | |
parent | 37b42724e70315330b9b2799a29d863cf2921782 [diff] | |
parent | 454e1afb636fc8d9556016117a0b24248e7bde01 [diff] |
am 454e1afb: (-s ours) am d251c54c: (-s ours) Import translations. DO NOT MERGE * commit '454e1afb636fc8d9556016117a0b24248e7bde01': Import translations. DO NOT MERGE