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
This commit is contained in: