| commit | 883773ff19de8dd12e8df101b30f5631b05d6118 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Sep 30 13:14:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 13:14:11 2015 +0000 |
| tree | c03c8020fb91b2a8a073594a49f848ed56d613ff | |
| parent | e6d6fe8a6faa358e930363f706fbbd878e391b6d [diff] | |
| parent | 48fab9d10ab12fb015e964e0e766091f485843ef [diff] |
am 48fab9d1: (-s ours) am 82c45e07: (-s ours) am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE * commit '48fab9d10ab12fb015e964e0e766091f485843ef': Import translations. DO NOT MERGE