| commit | d286e72afa00af59b3e7ac53d2fef1ee7b96b61f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:18:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:18:17 2015 +0000 |
| tree | a5dfa9d1f9fd23340911dd5dd9a26067ef5f6915 | |
| parent | e4687203da485bfa83d178a6bc1e6d62cb0770ca [diff] | |
| parent | a0c8c941cfd673e3079e392b8a4238444ec19703 [diff] |
am a0c8c941: (-s ours) am 9ba9ce92: (-s ours) Import translations. DO NOT MERGE * commit 'a0c8c941cfd673e3079e392b8a4238444ec19703':