| commit | 7da8a52d9402ab5bee1b0b3543530190c743d637 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 17 22:42:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 17 22:42:12 2012 -0700 |
| tree | 12ea8436c526155589306f910cc17fff5304c5b4 | |
| parent | 2a91b82b80cb0deb52529ce06cf154b07d9c7993 [diff] | |
| parent | 17d6b95fa8cf5ca37f988e3c4fa8ccff83a6fe5a [diff] |
am 17d6b95f: (-s ours) am 825b7012: am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '17d6b95fa8cf5ca37f988e3c4fa8ccff83a6fe5a': Import translations. DO NOT MERGE