| commit | 5f223ca91ea8f1ba3422ce0cb443c1940efbfd69 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 13 01:21:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 13 01:21:00 2015 +0000 |
| tree | f5a9ae91b8bb546e43663331e66c0f3469080c7c | |
| parent | 2e6ccb2c7d08e111a38140e3b3e6e25183449897 [diff] | |
| parent | e43301e29ac0df0e02d969adf98cfa44055e9532 [diff] |
am e43301e2: (-s ours) am 74e26974: (-s ours) Import translations. DO NOT MERGE * commit 'e43301e29ac0df0e02d969adf98cfa44055e9532': Import translations. DO NOT MERGE