by liu
Merge branch 'master' of https://github.com/codes4money/yi

Conflicts:
	gen/com/android/internal/telephony/ITelephony.java