commit | 63f898ac1117379b073de5ec40019d8c46acbf7c | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Dec 12 08:40:40 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 08:40:40 2013 -0800 |
tree | ada68adf262b3dfb6afe67a025ee1747c1eead85 | |
parent | f0ab16cfebed98074e06a60cc1752f3dcfbb6870 [diff] | |
parent | 299926e60f4ac8ef3a228ca38ce45d290b69659b [diff] |
am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '299926e60f4ac8ef3a228ca38ce45d290b69659b': Import translations. DO NOT MERGE