Update for gerrit.

Change-Id: Ife626d32b1110602d871bc5400b685e49c5fc039
changed some small things to test gerrit

Change-Id: I086f7968630e8f65ba59e42c107a150df01d4033
more working on gerrit

Change-Id: I1b18779f1cb6041ea3c1c881a1fc722421cb31ae
Revert "more working on gerrit"

This reverts commit 811ab5f8bc2429a7879bda8695c7fb84730aabee.
Merge branch 'jb3' of https://github.com/CarbonDev/android into CB4.3

Conflicts:
	default.xml