Updated SDK to commit 6fc99cf2d85307edfff07025f5a28ac3e2479df0
Updated SDK to commit a0e18f48d6b5e129d11d531885afe3a94983f78a
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/dimens.xml