| commit | 6b82b2fc1d5baa2ac233168ed860ecbac3e0c74e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:59 2014 +0000 |
| tree | 7bab9c286839e10ad609e28a90248146862a7c95 | |
| parent | cbb7e965e307d71e0b981e44fa9b80db90c89226 [diff] | |
| parent | 651361ce5846ceb479a96210456377f14aed050a [diff] |
am 651361ce: (-s ours) am 29dfdb59: (-s ours) Import translations. DO NOT MERGE * commit '651361ce5846ceb479a96210456377f14aed050a': Import translations. DO NOT MERGE