| commit | 946d7388c7afa8043379eb30176fbf848d74e926 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 17:42:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 17:42:37 2014 +0000 |
| tree | 1787668254e3176e64d6ee9b77a16ff56cee42f2 | |
| parent | 5c451d58935b68d64574764f6253a6737b524966 [diff] | |
| parent | 3e3b91dc9b78e031c7e84219315fc9d5282f91c7 [diff] |
am 3e3b91dc: (-s ours) am d218ba4b: (-s ours) Import translations. DO NOT MERGE * commit '3e3b91dc9b78e031c7e84219315fc9d5282f91c7': Import translations. DO NOT MERGE