| commit | 540949bedc17b25cde674761e8cd43114abe9a4c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 14:55:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 14:55:34 2015 +0000 |
| tree | 52412365d2a55899c32e28f32722d7a31830834f | |
| parent | 160bf5ee1bc67218feafce9868661f580b19bbdc [diff] | |
| parent | 19e5cd857ee0c3052b5572bced968f211dc7534e [diff] |
am 19e5cd85: (-s ours) Import translations. DO NOT MERGE * commit '19e5cd857ee0c3052b5572bced968f211dc7534e': Import translations. DO NOT MERGE