git apply the patch from i9100 and merge rejects

for framework.jar (smali/android/app/Activity.smali is not modified)

	modified:   framework.jar.out/build/apk/classes.dex
	modified:   framework.jar.out/dist/framework.jar
	modified:   framework.jar.out/smali/android/app/ActivityManager.smali
	modified:   framework.jar.out/smali/android/app/ActivityThread.smali
	modified:   framework.jar.out/smali/android/app/ApplicationPackageManager$ResourceName.smali
	modified:   framework.jar.out/smali/android/app/ApplicationPackageManager.smali
	modified:   framework.jar.out/smali/android/app/ContextImpl$14.smali
	modified:   framework.jar.out/smali/android/app/ContextImpl.smali
	modified:   framework.jar.out/smali/android/app/DownloadManager$CursorTranslator.smali
	modified:   framework.jar.out/smali/android/app/DownloadManager$Query.smali
	modified:   framework.jar.out/smali/android/app/DownloadManager.smali
	modified:   framework.jar.out/smali/android/app/LoadedApk.smali
	modified:   framework.jar.out/smali/android/content/pm/ApplicationInfo.smali
	modified:   framework.jar.out/smali/android/content/pm/PackageItemInfo.smali
	modified:   framework.jar.out/smali/android/content/pm/PackageManager.smali
	modified:   framework.jar.out/smali/android/content/pm/PackageParser.smali
	modified:   framework.jar.out/smali/android/content/pm/ParceledListSlice$1.smali
	modified:   framework.jar.out/smali/android/content/pm/ResolveInfo.smali
	modified:   framework.jar.out/smali/android/content/res/AssetManager.smali
	modified:   framework.jar.out/smali/android/content/res/Configuration.smali
	modified:   framework.jar.out/smali/android/content/res/Resources$Theme.smali
	modified:   framework.jar.out/smali/android/content/res/Resources.smali
	modified:   framework.jar.out/smali/android/graphics/drawable/DrawableContainer$DrawableContainerState.smali
	modified:   framework.jar.out/smali/android/graphics/drawable/NinePatchDrawable.smali
	modified:   framework.jar.out/smali/android/hardware/SensorManager.smali
	modified:   framework.jar.out/smali/android/media/AudioService.smali
	modified:   framework.jar.out/smali/android/media/MediaFile.smali
	modified:   framework.jar.out/smali/android/net/Proxy.smali
	modified:   framework.jar.out/smali/android/os/RecoverySystem.smali
	modified:   framework.jar.out/smali/android/os/Vibrator.smali
	modified:   framework.jar.out/smali/android/sec/clipboard/ClipboardExManager.smali
	modified:   framework.jar.out/smali/android/telephony/PhoneNumberUtils.smali
	modified:   framework.jar.out/smali/android/telephony/TelephonyManager.smali
	modified:   framework.jar.out/smali/android/text/format/DateFormat.smali
	modified:   framework.jar.out/smali/android/view/HapticFeedbackConstants.smali
	modified:   framework.jar.out/smali/android/view/View.smali
	modified:   framework.jar.out/smali/android/view/ViewRootImpl.smali
	modified:   framework.jar.out/smali/android/webkit/HTML5VideoViewProxy$VideoPlayer.smali
	modified:   framework.jar.out/smali/com/android/internal/app/ShutdownThread$2.smali
	modified:   framework.jar.out/smali/com/android/internal/app/ShutdownThread.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/AdnRecord.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/AdnRecordCache.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/CallerInfo.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/CallerInfoAsyncQuery.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/IIccPhoneBook.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/IccPhoneBookInterfaceManager.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/SMSDispatcher.smali
	modified:   framework.jar.out/smali/com/android/internal/telephony/gsm/GsmDataConnectionTracker.smali
	modified:   framework.jar.out/smali/com/android/internal/view/menu/ActionMenuItemView.smali
	modified:   framework.jar.out/smali/com/android/internal/view/menu/ActionMenuView.smali
	modified:   framework.jar.out/smali/com/android/internal/view/menu/MenuItemImpl.smali
	modified:   framework.jar.out/smali/com/android/internal/widget/ActionBarContainer.smali
	modified:   framework.jar.out/smali/com/android/internal/widget/ActionBarView$HomeView.smali
	modified:   framework.jar.out/smali/com/android/internal/widget/LockPatternUtils$PasswordFileObserver.smali
	modified:   framework.jar.out/smali/com/android/internal/widget/LockPatternUtils.smali
	modified:   framework.jar.out/smali/com/android/internal/widget/ScrollingTabContainerView.smali