| commit | 49b677fa7751d7017746fcbc46ec5e9b215ebad5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 05 13:20:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 13:20:33 2015 +0000 |
| tree | f940caf66877f29b6864ffd2543f83b078559290 | |
| parent | 8bbf18078581673489ce39a1a22b002334248155 [diff] | |
| parent | 3e95a70e021d0a93da3947a38bd7b29615e2c177 [diff] |
am 3eca1f1e: (-s ours) am 06ace6a8: (-s ours) Import translations. DO NOT MERGE * commit '3eca1f1e4a82e9c00233df3b5adf7f443892529c': Import translations. DO NOT MERGE