| commit | 3afc487ef5f1c8a1039a5b06b1b8538b4cb3672f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 15 20:52:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 20:52:38 2014 +0000 |
| tree | 4b243fce3e259c32fe00cc967304b81e81610490 | |
| parent | f33714c4072766c56c390004294e91df9a70a7fb [diff] | |
| parent | a005a7b017d4cb2afdb6c0c359b334c3e7dcb285 [diff] |
am 3c68d0b7: (-s ours) Import translations. DO NOT MERGE * commit '3c68d0b7d52d9460453588801269778ee64ac929': Import translations. DO NOT MERGE