| commit | de4b6f2ecc687744803cfadfc69cb83bca000392 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 17:41:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 17:41:18 2015 +0000 |
| tree | 08e49f6092c7c205a2872464672b088744c75e28 | |
| parent | 527730dfeb65852a0dc120301b261b5e532e4860 [diff] | |
| parent | 8ecd21d9c6e45bc51d6502f935c0a9c9893eff55 [diff] |
am 698da3ce: (-s ours) Import translations. DO NOT MERGE * commit '698da3ceed7a730a96ae8b7aada35503b710eb22': Import translations. DO NOT MERGE