show nav bar
Remove gsm.mk

Change-Id: I04b8a8ebbc8d7addbcb93a1e285b63c52e64a37d
Merge remote-tracking branch 'origin/cm-10.2' into jb4.3

Conflicts:
	mm.mk