| commit | 7221a6bcaaf1add38e8eb44e35c7f5f9f4de33f0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 02 15:36:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 15:36:59 2015 +0000 |
| tree | b8ff8e09ffddd0b8f94b5efd5f31e4ac04923ff8 | |
| parent | 233183439f1ac06c3985744bce18b0d36fd7a747 [diff] | |
| parent | c202347d6ec25a525ac51707461b903d7061270d [diff] |
am c202347d: (-s ours) am 0bb8ba32: (-s ours) Import translations. DO NOT MERGE * commit 'c202347d6ec25a525ac51707461b903d7061270d': Import translations. DO NOT MERGE