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

Change-Id: I62b91239ceba7b3cfda24230547ec755a02bd298