| commit | 62bc5541ede81e5ff9e5934b6bd348885353fced | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 20:11:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 20:11:28 2014 +0000 |
| tree | 65f3d1739a2535996ac153f81f964ee1e123b791 | |
| parent | 05c9828a8f2db6b2400f8cf95023eaa3b0427d2e [diff] | |
| parent | 1bdaa4dba229006b50d6fd7ba0a8c9df06cf5571 [diff] |
am 1bdaa4db: (-s ours) am ebdb7803: (-s ours) Import translations. DO NOT MERGE * commit '1bdaa4dba229006b50d6fd7ba0a8c9df06cf5571': Import translations. DO NOT MERGE