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