| commit | 7f0d2cbb936187aa0d150a342e5cba6aac5cb659 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:25:04 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:25:04 2012 -0800 |
| tree | 7b727d5f17674333fa90c6ff905a5ce42a6a0cee | |
| parent | b9d7b25b2798e7ff0aebfa4b7ff9cf8985015a82 [diff] | |
| parent | bbfffe8256db65326201619c4d73487659bf57c8 [diff] |
am bbfffe82: am 10117f6f: (-s ours) am 5b6c1af3: (-s ours) am 29e5c899: Import translations. DO NOT MERGE * commit 'bbfffe8256db65326201619c4d73487659bf57c8': Import translations. DO NOT MERGE