| commit | be7a6ee324b41fa228fa392a782992250fe6fefb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:58:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:58:41 2015 +0000 |
| tree | a30c4f1ac8f2bbe7db9cdc7853307082cf2e69b0 | |
| parent | 860632c5f3e017c79f192aa73c591ce2870c2355 [diff] | |
| parent | ec234355575c8472ec000138320f7d042f5283a8 [diff] |
am ec234355: (-s ours) am 48ac99fc: (-s ours) am a8e033d1: (-s ours) Import translations. DO NOT MERGE * commit 'ec234355575c8472ec000138320f7d042f5283a8': Import translations. DO NOT MERGE