| commit | b608c783fbad1d3fe49b9e98fbdc4e56666262ff | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 28 15:41:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 15:41:00 2015 +0000 |
| tree | c02facb058e9a60a54a3360552b67e5bdcccbd0b | |
| parent | 447df638fa076ce9443b6c1aa6be495ee403c340 [diff] | |
| parent | a1add7a90c7a9d9108820f41c44171a1ecc222e1 [diff] |
am cf471a39: (-s ours) am 0666a43b: (-s ours) Import translations. DO NOT MERGE * commit 'cf471a39d13adeda70d041b69c58fbd70307e283': Import translations. DO NOT MERGE