| commit | 0f591c64ff895363f5b02521cd02648463d1062a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:03:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:03:23 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | b4b0e65ed8d4bfcf88a14e66b21973e447669c4d [diff] | |
| parent | beaa8a473ff0f9f2f2d93d25a34e880007062f53 [diff] |
am beaa8a47: (-s ours) am 5df8b427: (-s ours) am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'beaa8a473ff0f9f2f2d93d25a34e880007062f53': Import translations. DO NOT MERGE