| commit | 65193ea618ec399ea01315ba7907fa413084bc34 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:32:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:32:06 2014 +0000 |
| tree | 2081a6253376d9b44bc5c712a963791abd992a45 | |
| parent | fa3a16c5741d26e2ef8de6caa41aa6fa353a9ed7 [diff] | |
| parent | 011f93505b2cd7ced66b6f6d9968bccbba9ae2fe [diff] |
am 011f9350: (-s ours) am 425c8e2f: (-s ours) am b184b5c6: (-s ours) Import translations. DO NOT MERGE * commit '011f93505b2cd7ced66b6f6d9968bccbba9ae2fe': Import translations. DO NOT MERGE