commit | 40ac65447bc9c7cf4f1b88ddde921fabb2448fe6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:46 2014 +0000 |
tree | cfc4dabf05af2268cc0c3bb773939e8a7a315809 | |
parent | b57d1ffe02049d85409131844c836e569cbccce2 [diff] | |
parent | c3ab889f9eda2a6307cc7ef82a626ec66522472a [diff] |
am c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'c3ab889f9eda2a6307cc7ef82a626ec66522472a': Import translations. DO NOT MERGE