commit | 7c857fe5cb24ca504c0e399f8a7f0a11b9d7cfe9 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Aug 16 11:31:52 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 16 11:31:52 2013 -0700 |
tree | d8c42fae3deb5089cde752a7403fc7a53be91fbb | |
parent | 1f04d799e756830c0c9b0e4ae6c8ff049d3834fd [diff] | |
parent | 01c69bd39f9e9ae0e6f95e70d89b76069737cf43 [diff] |
am 01c69bd3: (-s ours) am ccfbdf7f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '01c69bd39f9e9ae0e6f95e70d89b76069737cf43': Import translations. DO NOT MERGE