| commit | 9a738537820213be7543a93ac61f9c05bb017e12 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:20:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:20:56 2015 +0000 |
| tree | 276aa65b5fecc6b4f0925e07879b917faefc4fcc | |
| parent | 5f11ba57273df7d4837f623447d6dd75c7cf8959 [diff] | |
| parent | a378003ad985b77a680338ede1782d0811caaf72 [diff] |
am a378003a: (-s ours) am 540949be: (-s ours) am 19e5cd85: (-s ours) Import translations. DO NOT MERGE * commit 'a378003ad985b77a680338ede1782d0811caaf72': Import translations. DO NOT MERGE