| commit | 3f38b3868330d9248fd284579505d026a26b537c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:39:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:39:11 2014 +0000 |
| tree | f31f71749e7405ac7479532a61519a86f4020ea9 | |
| parent | 8ad7c809592da4d921fbb8a6a53fa99c9497dccb [diff] | |
| parent | e875cef62e8a0a70c91349d110fbc4ce34422991 [diff] |
am e875cef6: (-s ours) am ced880f5: (-s ours) Import translations. DO NOT MERGE * commit 'e875cef62e8a0a70c91349d110fbc4ce34422991': Import translations. DO NOT MERGE