| commit | 850fd489dea0cdf7199cce73027fc95658b0993f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 04 14:14:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 14:14:29 2015 +0000 |
| tree | 7d5baa6fdc44257dc28edef4cc78070ea8293bc7 | |
| parent | 116b9336e2798fdbdea1b98aa4455b485268587b [diff] | |
| parent | b214417a6e1a7cca5bac961c2b32b72d8baea2dd [diff] |
am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd': Import translations. DO NOT MERGE