| commit | 616b5f7a9de802bcc8208bbd1e93cbe3c8e26593 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:14:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:14:11 2015 +0000 |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 | |
| parent | c531bb2dc694edb6f2d9178fd6f437086e23931e [diff] | |
| parent | 1181b92d323b60d7ede72bf619a25a95520c2c42 [diff] |
am 1181b92d: (-s ours) am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE * commit '1181b92d323b60d7ede72bf619a25a95520c2c42': Import translations. DO NOT MERGE