| commit | fd9b7cf03c4454df8ddf166eb37fa5370d28125b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 13:13:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:13:34 2015 +0000 |
| tree | 838e272e939b46eb3bcb26a7bda2db066a92cad0 | |
| parent | 5e183ac6608eb5aca32a2a2835cd321217b451fb [diff] | |
| parent | e3d8faa5ba76f79b112dd8925189455e878e3a66 [diff] |
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 'e3d8faa5ba76f79b112dd8925189455e878e3a66': Import translations. DO NOT MERGE