| commit | 432f67c4a0f77880f6def1150ea803b54367a175 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:54:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:54:37 2015 +0000 |
| tree | d5807819979034ccb38db0cd4b1bd515b5ee319f | |
| parent | 3fa10288cb006bdd92afcf07b97f50367054da88 [diff] | |
| parent | d28d46e33c3303b9723c5cab7cfd0d198db01579 [diff] |
am d28d46e3: (-s ours) am 22c0a189: (-s ours) Import translations. DO NOT MERGE * commit 'd28d46e33c3303b9723c5cab7cfd0d198db01579': Import translations. DO NOT MERGE