commit | 573ac636a90ede2a573b0414ca725b25f0b78ac2 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:21:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:21:16 2014 +0000 |
tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
parent | 9048d47655b11df07e4dd009a75a73e472aa5202 [diff] | |
parent | ac572525dfe2664bc2bd4fea510c3ca5e600648a [diff] |
am ac572525: (-s ours) am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ac572525dfe2664bc2bd4fea510c3ca5e600648a': Import translations. DO NOT MERGE