Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
Upstream, CAF, and other small fixes.

Conflicts:

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
Upated apns.xml for Motorola Triumph, added apns from Cherry Magnum 2.3.4
Motorola Triumph camera fixes.

Conflicts:

	services/camera/libcameraservice/CameraHardwareInterface.h
	services/camera/libcameraservice/CameraService.cpp
Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
Upstream, CAF, and other small fixes.

Conflicts:

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
Upstream, CAF, and other small fixes.

Conflicts:

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
Upstream, CAF, and other small fixes.

Conflicts:

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
Revert "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"

This reverts commit 06ade6ae1bd015e8b8ad0685847911213c93cc5b.

Conflicts:

	core/jni/android_bluetooth_HeadsetBase.cpp
	core/jni/android_server_BluetoothA2dpService.cpp
	core/jni/com_android_internal_content_NativeLibraryHelper.cpp
	drm/jni/android_drm_DrmManagerClient.cpp
	libs/gui/SurfaceTexture.cpp
	libs/rs/driver/rsdShaderCache.cpp
	libs/utils/AssetManager.cpp
	media/jni/android_media_MediaProfiles.cpp
	media/libmedia/AudioTrack.cpp
	media/libmedia/MediaProfiles.cpp
	media/libmedia/ToneGenerator.cpp
	media/libmediaplayerservice/MediaPlayerService.cpp
	media/libmediaplayerservice/nuplayer/NuPlayer.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/AwesomePlayer.cpp
	media/libstagefright/OMXCodec.cpp
	services/audioflinger/AudioFlinger.cpp
	services/audioflinger/AudioPolicyService.cpp
	voip/jni/rtp/AudioGroup.cpp
Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java