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