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