| commit | a8562f004416b71fda75fa48ad2949190a190d74 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 00:07:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 00:07:34 2014 +0000 |
| tree | 3cdbf3b2b877a494ef6136b3cfef146419363f1c | |
| parent | 9735cbd1e37398ed24267bdb43570f28b810572e [diff] | |
| parent | 460d0ebc9e09ded142f49a6fe318b01ccd8d7f9e [diff] |
am 460d0ebc: (-s ours) am 6bc4577c: (-s ours) Import translations. DO NOT MERGE * commit '460d0ebc9e09ded142f49a6fe318b01ccd8d7f9e': Import translations. DO NOT MERGE