commit | 6da702f28b967c5efea81ce755e99c2bbafe7dcf | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Oct 21 14:09:05 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 21 14:09:05 2013 -0700 |
tree | 4224606fc56b5a1aa9ca6fbac761112a122151f5 | |
parent | 9cd06454eb6376d7423d71b8692894ab61aefec8 [diff] | |
parent | a57e1744a5cda4e2363a8c41415719117e6c0382 [diff] |
am eea98daa: (-s ours) am 78f11bed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'eea98daa1dc1b4bcb5febcf8bac5937b8a5ceac2': Import translations. DO NOT MERGE