| commit | e3cfc50cb04c8965c9f286e874ec6d2f4f446e03 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 13:22:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:22:36 2015 +0000 |
| tree | c89da9ce6365c618156f432b6d08bb9962086ab7 | |
| parent | 8527762af63566c75d955a8d8bb1f8c3ead442af [diff] | |
| parent | b224ec187db4f065bc8f4015eadfef10deba0e73 [diff] |
am b224ec18: (-s ours) am fd9b7cf0: (-s ours) am e3d8faa5: (-s ours) am 4f7f05a0: (-s ours) am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE * commit 'b224ec187db4f065bc8f4015eadfef10deba0e73': Import translations. DO NOT MERGE