| commit | 19f65359b90d2a69b044936b81f4fd4a3d6aa32e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 13:22:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 13:22:20 2015 +0000 |
| tree | 60898b90cdbe558feee90831b37d9e668827c3fd | |
| parent | ef096473c82db35cc0d69f03244c00e5767d8796 [diff] | |
| parent | 4777b612e07f57afbcf362b78b0b6e1e5e77e8bb [diff] |
am 4777b612: (-s ours) am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE * commit '4777b612e07f57afbcf362b78b0b6e1e5e77e8bb': Import translations. DO NOT MERGE