| commit | e1d46df81faa38f9c91875f32a6c4b4ae3709731 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 23:19:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:19:38 2014 +0000 |
| tree | c1acd42a3525f9ba06a28710d0f75b1d9dea024d | |
| parent | a9dc465a8e416f053046c8c9643b3ff48ec20d71 [diff] | |
| parent | fb5729793892c32667a318c35716f0f4d4b6ffb0 [diff] |
am fb572979: (-s ours) am 5a9bbe1d: (-s ours) Import translations. DO NOT MERGE * commit 'fb5729793892c32667a318c35716f0f4d4b6ffb0': Import translations. DO NOT MERGE