Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp * commit '1edd8277440c83ef44e0128e86afb8c002e49b17': Hide unused fields
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp * commit '1edd8277440c83ef44e0128e86afb8c002e49b17': Hide unused fields