commit | d959b91cb352d8cd5022cd1ec1b53538e51e1aef | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Nov 14 07:37:51 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 14 07:37:51 2013 -0800 |
tree | 59489633a253607fd59bb34b0ffd21813420e205 | |
parent | 53ac70b04fecf9d1bcbd4673dd28e2f2e76640fb [diff] | |
parent | fa87e78dae85af547752a9645d7654e9fa7de9c4 [diff] |
am d89198df: (-s ours) am de4adc84: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd89198df612183e16d6cd8206ee354ae98606756': Import translations. DO NOT MERGE