| commit | 82c0f1c413273ddf6e04412f4502682dc81a6a20 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 14:17:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 14:17:05 2015 +0000 |
| tree | f0143a76e4fcb5ae5205cc057aaff73b4347813a | |
| parent | 70facd5836cee17ce4b344bd60a84b1490564c4d [diff] | |
| parent | 62679a1f6d04a554e452b5126ccb784c3870a035 [diff] |
am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE * commit '62679a1f6d04a554e452b5126ccb784c3870a035': Import translations. DO NOT MERGE