am ee0835b9: (-s ours) Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
* commit 'ee0835b95de225fdc34d45b777b4595d01727a40': Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE) Fix disappearing nav icons. (DO NOT MERGE)
This commit is contained in:
commit
f2aef6f83f