| commit | 44a4a97c7d347e85b1c65c8c95398229617ba939 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:17:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:17:05 2015 +0000 |
| tree | d42c14c532acad544101ef7cb53e63a298ce4164 | |
| parent | 45c9fa94b80dea42d95e12df0868738ba386098b [diff] | |
| parent | 1044a9862e37a451cd7e2ea4d32f9b389ae3ee5d [diff] |
am 1044a986: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE * commit '1044a9862e37a451cd7e2ea4d32f9b389ae3ee5d': Import translations. DO NOT MERGE