| commit | 5f87bb027ce5799ce88da15f88ca4b4f36f88007 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 25 12:58:30 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 25 12:58:30 2013 -0800 |
| tree | 6deeb52821e730cfc029e23963c17298801018cf | |
| parent | 6a1d96e710f155b148c60cecce5c6beae1d02db1 [diff] | |
| parent | c2d1fdac9e7e914d4ecded6016c9056fa250d267 [diff] |
am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE * commit 'c2d1fdac9e7e914d4ecded6016c9056fa250d267': Import translations. DO NOT MERGE