| commit | f0336df5a7a1333974a909fb85f8351dbaef8afc | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 31 15:50:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 15:50:34 2012 -0700 |
| tree | 118ebb661ac00d3d5572afe7f0c2273b1d38e259 | |
| parent | b138995f6c0aa3ef7170df9f7d90eff4351e25fd [diff] | |
| parent | fdb26c1e853ba16af0794ced83463aa1744a8a99 [diff] |
am fdb26c1e: (-s ours) am 69a1f6e6: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'fdb26c1e853ba16af0794ced83463aa1744a8a99': Import translations. DO NOT MERGE