| commit | 3e5dbefeb4b400e931dd1a8945fef8b945379f78 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 27 18:51:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:16 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | eefda919c3ee1f26ea5a0134e1bdd26882169108 [diff] | |
| parent | 820f5aebe51889a611f7444475688e4053695f04 [diff] |
am 820f5aeb: (-s ours) am d218ba4b: (-s ours) Import translations. DO NOT MERGE * commit '820f5aebe51889a611f7444475688e4053695f04':