| commit | 8f0ee3ca1fdfa6aae5ab468d58bf456004d6de42 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 23:21:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:21:31 2015 +0000 |
| tree | 225daf6b9889cd298603335dcfa23c3ca1ddf63a | |
| parent | a827e5022536f731a884a299b4c0561900e74f98 [diff] | |
| parent | bb43771d7891465cc58392e2e5bc90f133e7bca8 [diff] |
am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE * commit 'bb43771d7891465cc58392e2e5bc90f133e7bca8': Import translations. DO NOT MERGE