| commit | a1641e814370f0f2bdfb241de249f9a8e10200a9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:43:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:43:15 2015 +0000 |
| tree | 9455cde495d658f78e2d561a60a374b59c021595 | |
| parent | 878faf03bc2ff22faf201c2e14b97ac47f95f977 [diff] | |
| parent | e3e4bd7f32c30fa131fb84142a9c1cd05771750e [diff] |
am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE * commit 'e3e4bd7f32c30fa131fb84142a9c1cd05771750e': Import translations. DO NOT MERGE