commit | 78c87758d04d92caf79ee0c47ad0cca9fef9cedd | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Nov 14 07:37:50 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 14 07:37:50 2013 -0800 |
tree | 11f8597dadc9175f13573e99c1c2e461a7af3235 | |
parent | e5e1544c911c72238f0bc2c253fbf03754ab73d0 [diff] | |
parent | 971ca440abad05e96df96e8f30c8a262f5be6f31 [diff] |
am 971ca440: (-s ours) am d2eab38a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '971ca440abad05e96df96e8f30c8a262f5be6f31': Import translations. DO NOT MERGE