| commit | 5fe1b23039b587e55a87779877851f9cae056096 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 16:26:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 16:26:15 2015 +0000 |
| tree | ee41758880549eeb352663c4ea210b4181289cd0 | |
| parent | c14c03f4382d23e3a81f317a98c5c808a4d02c3a [diff] | |
| parent | 908620fde5ef0e8c502eb6e5ec6798c5e934551b [diff] |
am f17182eb: (-s ours) am a908d1be: (-s ours) am 6702954c: (-s ours) am 549c2a30: (-s ours) Import translations. DO NOT MERGE * commit 'f17182ebf1a793027b045abf70cad8beaf563078': Import translations. DO NOT MERGE