| commit | b95d482987d77ebe9fe04e8cb763742f3883ce0f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 23:19:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:19:47 2014 +0000 |
| tree | 19c0704be926e0b329f9fa8b8a0c7d39c461409a | |
| parent | 9bb8018e05f1cf1ed9d176a65ba77a98753dce74 [diff] | |
| parent | 7886244c6429675ab927e5338ee8e97b01b95b6f [diff] |
am 1f209fce: (-s ours) am 8837d172: (-s ours) Import translations. DO NOT MERGE * commit '1f209fce0e4fff0a79402ac9268585ee2e114e70': Import translations. DO NOT MERGE