| commit | b8a2bedc3e7ca467662b505d2688d6f3d71b2b4a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:41 2015 +0000 |
| tree | 08bb4f16d8569c2ac18f26ae8a830a820a9606de | |
| parent | 9a3ff2ac28326087c28697c675ca124493d55616 [diff] | |
| parent | a16ac39ed2faf219be153270b62eeee375c19152 [diff] |
am a16ac39e: (-s ours) am ef5db639: (-s ours) Import translations. DO NOT MERGE * commit 'a16ac39ed2faf219be153270b62eeee375c19152': Import translations. DO NOT MERGE