Merge commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp * commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4': Introduce ContentValuesBuilder and make tests easier to read.
Merge commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp * commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4': Introduce ContentValuesBuilder and make tests easier to read.