| commit | 9c2adba1310528627b91584377d966763ecdd279 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 29 14:37:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 14:37:55 2012 -0700 |
| tree | ed533438630208ecca64546341219a3d5858a6fb | |
| parent | b717352578c162e061b15425f504e06104b4da77 [diff] | |
| parent | 950ace6772f6b9bd1b861771bff4b12d3f12aa3f [diff] |
am 950ace67: (-s ours) am 02e9618c: Import translations. DO NOT MERGE * commit '950ace6772f6b9bd1b861771bff4b12d3f12aa3f': Import translations. DO NOT MERGE