| commit | 7fc3d0589b22b837f42ea5c5fb0448c85c7054fa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:40:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:40:47 2015 +0000 |
| tree | 320c9ee3b5b6483992abba889a5f0240886293ab | |
| parent | 92cdbd9f261f58213c9eeed18fcde56405e7d7a4 [diff] | |
| parent | 8ee36d26ac32590c93cf1e37e8a97370f4b2b803 [diff] |
am 8ee36d26: (-s ours) am 5d73cf77: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE * commit '8ee36d26ac32590c93cf1e37e8a97370f4b2b803':