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