| commit | 65ed5668037d5cc9e64e93ed558f9f8d8cf14ade | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 02 15:14:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 02 15:14:43 2015 +0000 |
| tree | 2aee0073e9008c0d27dfd564a979ef7208a2861e | |
| parent | 69c827d18281ba4c7763256eeef0203f3ef4d787 [diff] | |
| parent | 3d8216000258dd72fd507d17790c02f2d0c78ec1 [diff] |
am 3d821600: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3d8216000258dd72fd507d17790c02f2d0c78ec1': Import translations. DO NOT MERGE