| commit | 434770d5851f5fdc67c040e56e654f4f114693dc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 14:10:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 14:10:00 2015 +0000 |
| tree | 6430b1732007673760899b2b6113f6c6f14da74e | |
| parent | 5adb4de35cf9e205f79f04ed940f52f2d89524a1 [diff] | |
| parent | 5f5c4b232e6605e2a6bc11b21adafabcf54c950e [diff] |
am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE * commit '5f5c4b232e6605e2a6bc11b21adafabcf54c950e': Import translations. DO NOT MERGE