commit | b76ca05fef52f48db02de46c4ef15348e554fff4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 21 16:57:59 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 16:57:59 2014 +0000 |
tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
parent | 5c2e47abc014a6f20f2074b970c0288f404b8ef4 [diff] | |
parent | fb52c953ac98cd7751a6d49cedf99eefcf86e70f [diff] |
am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'fb52c953ac98cd7751a6d49cedf99eefcf86e70f': Import translations. DO NOT MERGE