| commit | 994b896ef15187b8e7abef679e76540d57f4b144 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:13:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:13:22 2012 -0800 |
| tree | a1f0c232092d6942b6e5d15626f31e4e826815e4 | |
| parent | a61ee4d9b1500bc4fc05bd868fba1ee730bbfa3a [diff] | |
| parent | 4000887f7f2d5a3a3bef4bc803325ee65d22d9e1 [diff] |
am 4000887f: (-s ours) am 0308361b: Import translations. DO NOT MERGE * commit '4000887f7f2d5a3a3bef4bc803325ee65d22d9e1':