| commit | c6c574e4877c39697d5085260ee1ae62561caa84 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 17:15:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:15:47 2015 +0000 |
| tree | 64275bfebb19faff023d7119e333b140263eb2c5 | |
| parent | b4cd9884404ff987013e37d658e64d860959d9af [diff] | |
| parent | ebb08ad9e09a6e740d4e0c96f6d74fb7e7cbd154 [diff] |
am ebb08ad9: (-s ours) am d6557581: (-s ours) am 7c69964c: (-s ours) am 9635e64e: (-s ours) Import translations. DO NOT MERGE * commit 'ebb08ad9e09a6e740d4e0c96f6d74fb7e7cbd154': Import translations. DO NOT MERGE