| commit | 6033950262f050d33e472dbf002296ddd97db649 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 01 17:13:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:13:12 2015 +0000 |
| tree | 52f1c4fbc6f6c840be3d1bb6c9dcbb65efde8b7d | |
| parent | c0c6e29aac0317499c660dd3291025e94edf056f [diff] | |
| parent | bd22190cbe643bfdaebe8784b7c975f154c40a45 [diff] |
am bd22190c: (-s ours) am ab9bca55: (-s ours) Import translations. DO NOT MERGE * commit 'bd22190cbe643bfdaebe8784b7c975f154c40a45': Import translations. DO NOT MERGE