| commit | 39d1497c877528361617c29eb7b57424f5cf39f1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:40:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:40:08 2014 +0000 |
| tree | c683c9ed8726ba2a72f0beedeecd15e1d94af2c4 | |
| parent | 0e6f9d39ed4a68a26e51447e2b5c8538e5fc342d [diff] | |
| parent | ce995ce2f5f5b53f65e8aa8f6a3e98f202998ece [diff] |
am a869e372: (-s ours) am cb5b0dd3: (-s ours) Import translations. DO NOT MERGE * commit 'a869e3720924890cc40c44d67c217edf89d0138a': Import translations. DO NOT MERGE