| commit | 7d49d182a2ebc7742bb0d9a89cae6daeaf4a5148 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:04:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:04:49 2015 +0000 |
| tree | 56217c46306b3dfeff9eda260218fcf053a2503d | |
| parent | 745329af0bf1fc409b0d14dbcf8ef68628b18a5f [diff] | |
| parent | 6a7af7a6b987a2853f6532f3abfd3c5296b20e9b [diff] |
am 6a7af7a6: (-s ours) am 3e9a75b7: (-s ours) Import translations. DO NOT MERGE * commit '6a7af7a6b987a2853f6532f3abfd3c5296b20e9b': Import translations. DO NOT MERGE