am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO...
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '84c90053':
Reimport Settings translations. DO NOT MERGE