| commit | 0729fc545f371cfd4a787034d652ae1bd817aaf2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:43:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:43:52 2015 +0000 |
| tree | 52e694c3229e5e75835e536a1136039fbeb87d89 | |
| parent | cf283bba3ec5b831275b3d48939e7afa1563cbf9 [diff] | |
| parent | b360befe91b2fbd796d40d59df128700e8f1f34c [diff] |
am 7f38172d: (-s ours) am f829725a: (-s ours) am eb827719: (-s ours) Import translations. DO NOT MERGE * commit '7f38172d7ac82d5979f9ed508615bd35166df251': Import translations. DO NOT MERGE