commit | f67cf060eb5804a307dbde174989fa1ddc7cc796 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 30 16:59:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 16:59:15 2014 +0000 |
tree | 842465c17ff43f71155e899572104add8bfab90f | |
parent | 43d6f97057833d7de33ca479c15c67a5000efc99 [diff] | |
parent | 3955e6d2afde5d7f10eb0eae065916fb20f32464 [diff] |
am 3955e6d2: (-s ours) Import translations. DO NOT MERGE * commit '3955e6d2afde5d7f10eb0eae065916fb20f32464': Import translations. DO NOT MERGE