| commit | f96413d9c54b8263d8777983609c0695f790b1ab | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 15:17:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 15:17:06 2015 +0000 |
| tree | 80089c66a944cb2913851982afebffb9b708382d | |
| parent | 8ad655f74d5c0e98aec1daaa6b3f29981ce6cb7a [diff] | |
| parent | 75d8adf62b03d5e428b63692cb4b142b95b40887 [diff] |
am 150f3ed6: (-s ours) am 06ed218d: (-s ours) am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE * commit '150f3ed6669ba693c1158fa5a45b8356a3975dda': Import translations. DO NOT MERGE