| commit | f41cd2e81ba403a8da3da3c054155b570a4d304a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 22 21:27:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 21:27:59 2014 +0000 |
| tree | 8b5fed58742e68368370b349cd081491e1e894c6 | |
| parent | e7f7c08798bf1c27ab42a4261d6c0689aac03887 [diff] | |
| parent | 78d1900b62d5973376993b70ae6ac00f5dbbaea0 [diff] |
am 78d1900b: (-s ours) am b54c100e: (-s ours) am 6ba0977d: (-s ours) Import translations. DO NOT MERGE * commit '78d1900b62d5973376993b70ae6ac00f5dbbaea0': Import translations. DO NOT MERGE