commit | 5ac6a47f25f603af68c2cc222d2713aea187b2f8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:44:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:44:06 2014 +0000 |
tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
parent | 36524e0cbd57e153840492d548c8471090525d05 [diff] | |
parent | de9bfb799e99440888ecd911d60f42ff206c886c [diff] |
am de9bfb79: (-s ours) am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'de9bfb799e99440888ecd911d60f42ff206c886c': Import translations. DO NOT MERGE