| commit | 333fa6e4847882891d80d91e766ce15b3c2d645e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 20:28:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 20:28:50 2015 +0000 |
| tree | c5873bac8bf138134bb1f051d29d4b92f6c34cca | |
| parent | cca8e882c360113737159bce5094b32e33d11ad0 [diff] | |
| parent | d43491f9e3359a0e6889b910a670fd758f6afd3b [diff] |
am d43491f9: (-s ours) am 6da67e1c: (-s ours) Import translations. DO NOT MERGE * commit 'd43491f9e3359a0e6889b910a670fd758f6afd3b': Import translations. DO NOT MERGE