| commit | 1de32102c520c2661bc4c1a5495cf4fb790b2181 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:58:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:58:01 2014 +0000 |
| tree | 3a009087a55caa0a85adcc3af9adaae90c260758 | |
| parent | 5c925e693676a5d12e2192b901f8b6e43c111cb1 [diff] | |
| parent | 5dedc48d181a0a5b16ee28ba8cbd18ae9b7f4ef8 [diff] |
am 5dedc48d: (-s ours) am 38530a7e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '5dedc48d181a0a5b16ee28ba8cbd18ae9b7f4ef8': Import translations. DO NOT MERGE