| commit | ebb08ad9e09a6e740d4e0c96f6d74fb7e7cbd154 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 00:42:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 00:42:45 2015 +0000 |
| tree | 08bb4f16d8569c2ac18f26ae8a830a820a9606de | |
| parent | b8a2bedc3e7ca467662b505d2688d6f3d71b2b4a [diff] | |
| parent | d6557581541f067035aaa0a39febdf719a4e8946 [diff] |
am d6557581: (-s ours) am 7c69964c: (-s ours) am 9635e64e: (-s ours) Import translations. DO NOT MERGE * commit 'd6557581541f067035aaa0a39febdf719a4e8946': Import translations. DO NOT MERGE