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