| commit | 8527762af63566c75d955a8d8bb1f8c3ead442af | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 13:00:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:00:53 2015 +0000 |
| tree | c89da9ce6365c618156f432b6d08bb9962086ab7 | |
| parent | 416565a8043b68b3bd13caa689c146561aa9c65b [diff] | |
| parent | c5f66d7e8488b6c5a46e2600ae399a898cd67945 [diff] |
am c5f66d7e: (-s ours) am 5e183ac6: (-s ours) am bd64cd59: (-s ours) am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE * commit 'c5f66d7e8488b6c5a46e2600ae399a898cd67945': Import translations. DO NOT MERGE