| commit | 13b560996a0b0e84ff1d60852d6d20112624dfdc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Dec 03 07:56:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 03 07:56:41 2014 +0000 |
| tree | e32eca44b4b21d74ef8730686d18c6b869c159fb | |
| parent | 1348bad20771eb46293d29f328a48f9fc47fc751 [diff] | |
| parent | eb0fdf48b75c567666676bb0b01ae098ab471407 [diff] |
am eb0fdf48: (-s ours) am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'eb0fdf48b75c567666676bb0b01ae098ab471407': Import translations. DO NOT MERGE