| commit | 45dda7897f24c7a64cc8dc7a60ce9961a82f3003 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 20:47:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 20:47:34 2014 +0000 |
| tree | 76ff5be3abf7f2abddd0b7bd61be625057cfaefe | |
| parent | eb266c31f94bf227df1ba787a8626966979e001f [diff] | |
| parent | 73a950602aa1bb90bbde92ddc9e5e0956f8f1124 [diff] |
am 73a95060: (-s ours) am f2e81836: (-s ours) Import translations. DO NOT MERGE * commit '73a950602aa1bb90bbde92ddc9e5e0956f8f1124': Import translations. DO NOT MERGE