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