| commit | c0c6e29aac0317499c660dd3291025e94edf056f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 13:58:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 13:58:02 2015 +0000 |
| tree | 52f1c4fbc6f6c840be3d1bb6c9dcbb65efde8b7d | |
| parent | cd87f7e837794007c9846d60706d53f5eb322aa3 [diff] | |
| parent | 439c0b5fc7686d847b254363cfab20ecf6d5c711 [diff] |
am 439c0b5f: (-s ours) am 581eb262: (-s ours) Import translations. DO NOT MERGE * commit '439c0b5fc7686d847b254363cfab20ecf6d5c711': Import translations. DO NOT MERGE