| commit | 4cdee7a61b140cf1a38b3d1eb1ac596525aa609b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri May 25 14:22:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 25 14:22:35 2012 -0700 |
| tree | ab9fd3333ad3b5512b9dd1b6c3f85f56bd9dbe23 | |
| parent | 85e9cc3b7072025bbb305015120348d3b325210c [diff] | |
| parent | 90817b8067ee76c0714b97ef93a0fab8d18b2116 [diff] |
am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '90817b8067ee76c0714b97ef93a0fab8d18b2116': Import translations. DO NOT MERGE