| commit | e70de673811dd23c12b468638343c7f3e017200d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 23:26:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:26:00 2015 +0000 |
| tree | 4abfc6c49660acd6235b1e918cd88a67408b979b | |
| parent | a046faaf38ad818e6b5e981a39fd7394cf7cee03 [diff] | |
| parent | 11ea0d6db68932254bf5a1e84adbc2255764b8e1 [diff] |
am 11ea0d6d: (-s ours) am 70eb8077: (-s ours) Import translations. DO NOT MERGE * commit '11ea0d6db68932254bf5a1e84adbc2255764b8e1': Import translations. DO NOT MERGE