| commit | 36e37990826c9d5708d9efb50b184827eba4c93f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 29 13:27:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 29 13:27:46 2012 -0700 |
| tree | cee77abebd0676088386446aedb1f079d736817b | |
| parent | 13419b16783e393f491616987cb8d374f4ebc993 [diff] | |
| parent | 511e3874ff9759a5ed1612fb21ef38947a3fd71f [diff] |
am 511e3874: am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '511e3874ff9759a5ed1612fb21ef38947a3fd71f':