| commit | 3b49f548529bc9286f595175c330f06b495153ad | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jun 11 13:08:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 13:08:59 2015 +0000 |
| tree | 047c2169a10f25c7de59f99e2a66704e6194bb85 | |
| parent | 0adb6c0a67c52b4620795141192a15b33fb62950 [diff] | |
| parent | 429a40f183a06e2c819ca15e435edd89ec24cf5d [diff] |
am 429a40f1: (-s ours) am 7d91e752: (-s ours) Import translations. DO NOT MERGE * commit '429a40f183a06e2c819ca15e435edd89ec24cf5d': Import translations. DO NOT MERGE