| commit | 3bca638eeda9e0cb2867598b6fc6a232e6779abb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:21:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:21:39 2014 +0000 |
| tree | 01f306db3cae806354b6acc1ad58694450d4dfaf | |
| parent | b806e59dcb4f25209f44e166f12586fdc0a17da5 [diff] | |
| parent | f54f7724047040139b5c4b129ccdc8912c29df42 [diff] |
am f54f7724: (-s ours) am 1c89781c: (-s ours) am 1d49da6b: (-s ours) Import translations. DO NOT MERGE * commit 'f54f7724047040139b5c4b129ccdc8912c29df42': Import translations. DO NOT MERGE