| commit | 6288ecba6d78bae84e96d5dee8c20523483754e9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:54:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:54:39 2015 +0000 |
| tree | 05cd9c0d4e8589cb436a228cf220218b288815c1 | |
| parent | 13273bdd238afc27993a5b4bcf9bf9f29a83f91d [diff] | |
| parent | 682147bb5de79d7643ec88d5dc1a7c6cf89e9d65 [diff] |
am 682147bb: (-s ours) am 7d3471a3: (-s ours) Import translations. DO NOT MERGE * commit '682147bb5de79d7643ec88d5dc1a7c6cf89e9d65': Import translations. DO NOT MERGE