Revert "Merge 20121118"

This reverts commit 900a67377d4c421469735d1d3f6b55c9f1113945.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java