Track our external skia/qcom display
Merge branch 'jb2' of git://github.com/LiquidSmooth/android into jb2

Conflicts:
	default.xml