| commit | 8d59b117bd4b0fed7d61d081878edd7fee81d54c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Mar 21 15:26:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 15:26:29 2015 +0000 |
| tree | fb42151371c111b213593c34b14fb30b84d95e5b | |
| parent | c6905107644d64934efb7aea12d93a176cc8782f [diff] | |
| parent | bb43771d7891465cc58392e2e5bc90f133e7bca8 [diff] |
am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE * commit 'bb43771d7891465cc58392e2e5bc90f133e7bca8': Import translations. DO NOT MERGE