Merge "Add closing div tag for ContentResolver javadoc" into pi-dev
am: a3a280e4d8

Change-Id: I12f32a13f8b6ca1c33bee80207c6e1bed6f7cb4b