| commit | 429a40f183a06e2c819ca15e435edd89ec24cf5d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jun 11 12:57:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 12:57:05 2015 +0000 |
| tree | 047c2169a10f25c7de59f99e2a66704e6194bb85 | |
| parent | 07a15fd5657a386c5647926dab5ef82f5bfdf521 [diff] | |
| parent | 7d91e752a34a997ba4995f15392fc85b42e2dc60 [diff] |
am 7d91e752: (-s ours) Import translations. DO NOT MERGE * commit '7d91e752a34a997ba4995f15392fc85b42e2dc60': Import translations. DO NOT MERGE