updated things for gerrit

Change-Id: Iabb21b31842699ff32b6725aedc18b65422109f5
updated manifest to be cleaner as well as for gerrit

Change-Id: I10eda7596dc4b3d47ec0ac094d8a106b316de0df
Track Tilapia

Change-Id: I923b488c0067f1b5431ad29446c1606aef9549f1
Track our own qcom/display and mako kernel.

Change-Id: I6c5c40b7cbd321e1ac37805dc6745dfda4d9325e
Track our own flo kernel.

Change-Id: I46b3e01f3be7b1aa0474cf7c3ec39c719c88b880
Merge "Track Tilapia" into jb3
Merge branch 'jb3' of https://github.com/CarbonDev/android into CB4.3

Conflicts:
	default.xml