| commit | a25ab86850d45fb0d953166d44cac58faf34d9c6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 14:34:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 14:34:42 2014 +0000 |
| tree | 3871719d1e114bc266d7e1fe8882d12499613e54 | |
| parent | c4de46dd7fa26b28a1571e066e9a533ee0735e11 [diff] | |
| parent | c0adb6e5383022b6be6dc6e6f72f1a2285cf5baf [diff] |
am c0adb6e5: (-s ours) am 1b3cf292: (-s ours) Import translations. DO NOT MERGE * commit 'c0adb6e5383022b6be6dc6e6f72f1a2285cf5baf': Import translations. DO NOT MERGE