Change "frameworks_base" to "halo" branch
Merge branch 'cm-10.2' of github.com:CyanKang/android into working
Update upstream tags to android-4.3_r2.2

Change-Id: Iac15e61b4755e1319c8bdd61321dc68f85865d63

Conflicts:
	default.xml