| commit | b4730b8a9e8ecc6920875e4782f829f7a21cc643 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Apr 11 14:28:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 11 14:28:21 2011 -0700 |
| tree | d0c90412606d0729db45c9f160479ae104d19326 | |
| parent | 184f8f085eff900aa16f3a71cf15a2dd3bf25ff5 [diff] | |
| parent | 2439b7c00d86fb490b48e2bc0927fd581bf59e0e [diff] |
am 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread * commit '2439b7c00d86fb490b48e2bc0927fd581bf59e0e': Reimport Settings translations. DO NOT MERGE