commit | 054cdcbd654544f027df793e97388323d445a906 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 22 13:05:41 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 22 13:05:41 2013 -0700 |
tree | 623c159e36a55fc1594e906b3deb561c3bd638af | |
parent | 351a3dce1ec3b5700742264d465b5bcffd38035b [diff] | |
parent | b57eee78248f02ac483daaeaa75248ecab9ecfd6 [diff] |
am b57eee78: (-s ours) am 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b57eee78248f02ac483daaeaa75248ecab9ecfd6': Import translations. DO NOT MERGE