commit | c106683094e2e67830c9ee1c35423d9fde4a7636 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Sep 05 23:52:07 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 05 23:52:07 2013 -0700 |
tree | 4106b34c58a18490e296a2f1bf1fcac9f6c2e351 | |
parent | 27c68786ec05aedf35f11df0b381391360aadac7 [diff] | |
parent | b3d69bf95eece256c05aea029a7f6ebf3f0fcd26 [diff] |
am b3d69bf9: (-s ours) am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b3d69bf95eece256c05aea029a7f6ebf3f0fcd26': Import translations. DO NOT MERGE