commit | d010cf12c796cf83c760df037916e5572ce55868 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 06 17:41:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 17:41:09 2014 +0000 |
tree | 24942a7aef2317a2bec82bdf55f5e89552beedda | |
parent | a45bb4be2f12144754aa62a5d44c39db08b21c92 [diff] | |
parent | 221849b6d68704340754200492329f19cef7979b [diff] |
am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '221849b6d68704340754200492329f19cef7979b': Import translations. DO NOT MERGE