| commit | 57083c544aa8e518a6507edc5fb6c17cba4c740f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 23:02:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 23:02:08 2014 +0000 |
| tree | 1975809cee08a0784c4d47657470354cec43d230 | |
| parent | 4ebd29dd7660366fb43a53dff8c2f3d642ca9dc6 [diff] | |
| parent | 7f6a191e6e293181a081e22b8fa43bd9799bfec2 [diff] |
am 7f6a191e: (-s ours) am df944b30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '7f6a191e6e293181a081e22b8fa43bd9799bfec2': Import translations. DO NOT MERGE