| commit | d35930d2088f55d4cc3d9897dc312a8a3e47aef2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:04:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:04:13 2015 +0000 |
| tree | 20db03caf89960458504d9e2d5b0938e99550084 | |
| parent | 237e0cc3015fb6eb43a0f5caeaff2a817e606ada [diff] | |
| parent | c9f2387a75d1e1309c3e16ce653a620b1aee0c33 [diff] |
am c9f2387a: (-s ours) am 6aefd8d2: (-s ours) am a7e9bc63: (-s ours) Import translations. DO NOT MERGE * commit 'c9f2387a75d1e1309c3e16ce653a620b1aee0c33': Import translations. DO NOT MERGE