| commit | fc40cbf1022ec45f1768cefe536af248e1a5300c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:30:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:30:06 2015 +0000 |
| tree | 3705997856069c23496debcd96bb6e20fffdca0e | |
| parent | 798ad89761c04e7a3b3df5bb05c313193f38daa2 [diff] | |
| parent | be2ede2e7ee52fd82d299f79cb6be288f137740c [diff] |
am 6b8b382f: (-s ours) am e2b3f64e: (-s ours) am ceada86c: (-s ours) Import translations. DO NOT MERGE * commit '6b8b382f2197f01428a28d267b9ed4eb0bb909d7': Import translations. DO NOT MERGE