commit | f6eceb2c79ff403ec1608ff36c09d5b8c9ea8bd2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Mar 17 20:43:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 20:43:48 2014 +0000 |
tree | 7b5af6406eab2199416834641948d7ea6c1abf2a | |
parent | 6e7db71959c43bfaa0b834f583e59377705a1d43 [diff] | |
parent | c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48 [diff] |
am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE * commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48': Import translations. DO NOT MERGE