| commit | bd485fdf66cd86e988952ed3d34b133e2b75a7fd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:46:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:46:29 2014 +0000 |
| tree | 24945a41eec94300eec88463193d4905dc5bb302 | |
| parent | b39b902750b3f20302946febee3be18a8574d569 [diff] | |
| parent | 38b624cd0463e348d7f90c1990f5fe711c7977a0 [diff] |
am 38b624cd: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '38b624cd0463e348d7f90c1990f5fe711c7977a0': Import translations. DO NOT MERGE