| commit | 15e0ab6ee8007b43c77226292eb2bedeb9b42543 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 16 19:52:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 19:52:24 2014 +0000 |
| tree | 6eac0c9aed78a9f4df1e392cc1306b43b0fe416a | |
| parent | 005bd98307a0e48acfbae70b7d9866210a0771e7 [diff] | |
| parent | d247d86085cf4385e6de2822f55da88376ca165d [diff] |
am d247d860: (-s ours) am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE automerge: e6feecb -s ours * commit 'd247d86085cf4385e6de2822f55da88376ca165d': Import translations. DO NOT MERGE