| commit | be2ede2e7ee52fd82d299f79cb6be288f137740c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:04:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:04:51 2015 +0000 |
| tree | 3705997856069c23496debcd96bb6e20fffdca0e | |
| parent | 83eced6b69a8dd71337df22b2f6cbc7c5f017c55 [diff] | |
| parent | b7f08ec9c2ec20e15b8f249a51dc9c5a15c81299 [diff] |
am e2b3f64e: (-s ours) am ceada86c: (-s ours) Import translations. DO NOT MERGE * commit 'e2b3f64ef3a6ae1c212bb7ec82bc03d6eab6f139': Import translations. DO NOT MERGE