| commit | f59a02242a21113565c0566b5d4184828bc33a8a | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Jun 06 12:44:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 06 12:44:07 2012 -0700 |
| tree | 80c68777412fa32f8e84ffdaee4b9af2b0686f87 | |
| parent | 404de74c49fc37bffd707f4bf1e2dd2e33ab2823 [diff] | |
| parent | 8e62634acd0a0baa6390038565247f757ed99906 [diff] |
am 8e62634a: (-s ours) am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '8e62634acd0a0baa6390038565247f757ed99906': Import translations. DO NOT MERGE