commit | 37e52cec7fd0b95a4671aebbc57e51f67c0d9479 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:05:13 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:05:13 2013 -0800 |
tree | c0554aeb91a8887e1299b959495cb39efda35201 | |
parent | 9bddf6163aceff9a0ccc7a70477f59b1385ab704 [diff] | |
parent | 2a6d8015c5d150b1cd729ab96a5d03dc44a0375a [diff] |
am 2a6d8015: (-s ours) am 688cd80c: (-s ours) am deb0189c: (-s ours) am 4b67a56b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2a6d8015c5d150b1cd729ab96a5d03dc44a0375a': Import translations. DO NOT MERGE