| commit | c9275e764de52ff5e59f02469ee95dbdc7928c95 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 20:55:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 20:55:35 2015 +0000 |
| tree | bc17b83cf23296bfff0a0b2749bd7bf07a535a71 | |
| parent | 541e115f5c1021c0a40a47b4f7acfa44a8902d70 [diff] | |
| parent | c7a024a179813640320e8e52309df861713ef6e7 [diff] |
am c7a024a1: (-s ours) am d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE * commit 'c7a024a179813640320e8e52309df861713ef6e7': Import translations. DO NOT MERGE