| commit | cb469c247cf1f82bc4b11faea98705d1d8c8fe87 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:42:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:42:52 2015 +0000 |
| tree | 2ab50c1e2e79713c20535ff244d5520f24a56774 | |
| parent | ee3253caf8b9800a32186b78f980a9ede85dcab9 [diff] | |
| parent | 3225addcb289426f54eee6dba03551b6932032c2 [diff] |
am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGE * commit '3225addcb289426f54eee6dba03551b6932032c2': Import translations. DO NOT MERGE