commit | 5b09205cc6576ab75e4b9827638044e42f746a7d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:44:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:44:15 2014 +0000 |
tree | 97d9781fe9f7a2d0d7543e829f74e62e9b15b237 | |
parent | 944c58a6bd6858627e4ed8619d06c96c72481ca8 [diff] | |
parent | 237dbc45c6558f6d93495f3580606f1a7cbf36b8 [diff] |
am 237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '237dbc45c6558f6d93495f3580606f1a7cbf36b8': Import translations. DO NOT MERGE