| commit | b206061bba698722373e99f87828efef9dca658f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 02 13:57:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 02 13:57:41 2015 +0000 |
| tree | 79a8e1fa0dd214e57a722dc98a1bbb736a9d2a3f | |
| parent | 727899fd0d6fe0de81bb329280e21b5152a1ae52 [diff] | |
| parent | f9175d5de1f3d6fb7b0c688bd700d757a8602384 [diff] |
am f9175d5d: (-s ours) am c92894e6: (-s ours) Import translations. DO NOT MERGE * commit 'f9175d5de1f3d6fb7b0c688bd700d757a8602384': Import translations. DO NOT MERGE