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