| commit | 9b00496569aa3eca96a397c4257927a4fccd288b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:08:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:08:56 2015 +0000 |
| tree | 2f08df22f31e3a6cac5d01c0c56244f65e422e21 | |
| parent | 8b82a307011fbcb90b1eca79ad868141c8f47f44 [diff] | |
| parent | 9c2e61b47a9c7eb4062d0296b9d907c46fc6bf54 [diff] |
am 9c2e61b4: (-s ours) am ba67c131: (-s ours) Import translations. DO NOT MERGE * commit '9c2e61b47a9c7eb4062d0296b9d907c46fc6bf54': Import translations. DO NOT MERGE