| commit | 7b62336f26bc5966080e8153690da4fa28f5adf3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 14 19:24:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 19:24:20 2015 +0000 |
| tree | 7bff683fd37205ce15ed6d48e77296822b61aa3a | |
| parent | 591a09131162a32ad5923dc3553a464a5da1d39c [diff] | |
| parent | 3d600a06119f2c11ba2394d64a84348aa94fd520 [diff] |
am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE * commit '3d600a06119f2c11ba2394d64a84348aa94fd520': Import translations. DO NOT MERGE