7c1a49f5f5ed6613d736464bf5001b777e89ced2 - platform/frameworks/base

commit	7c1a49f5f5ed6613d736464bf5001b777e89ced2	[log] [tgz]
author	Chris Craik <[email protected]>	Wed Feb 13 10:25:12 2013 -0800
committer	Chris Craik <[email protected]>	Wed Feb 13 10:50:20 2013 -0800
tree	c6726264bde03f4c5957876921d4b15a835b2c71
parent	d04892d207d50378356feef181ac4e4eff9652d7 [diff]

Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e

core/java/android/view/GLES20Canvas.java[diff]
core/java/android/view/Surface.java[diff]
core/jni/Android.mk[diff]
core/jni/android/graphics/BitmapFactory.cpp[diff]
core/jni/android/graphics/Canvas.cpp[diff]
core/jni/android/graphics/NinePatchImpl.cpp[diff]
core/jni/android/graphics/Region.cpp[diff]
core/jni/android/graphics/TextLayoutCache.cpp[diff]
core/jni/android/graphics/Typeface.cpp[diff]
core/jni/android_view_GLES20Canvas.cpp[diff]
core/jni/android_view_Surface.cpp[diff]
core/jni/android_view_TextureView.cpp[diff]
graphics/java/android/graphics/Canvas.java[diff]
graphics/java/android/graphics/Path.java[diff]
graphics/java/android/graphics/Typeface.java[diff]
libs/hwui/Android.mk[diff]
libs/hwui/DisplayListRenderer.h[diff]
libs/hwui/FontRenderer.cpp[diff]
libs/hwui/Layer.h[diff]
libs/hwui/OpenGLRenderer.cpp[diff]
libs/hwui/font/CacheTexture.cpp[diff]
libs/hwui/font/Font.cpp[diff]
media/tests/omxjpegdecoder/SkOmxPixelRef.h[diff]
packages/SystemUI/res/values-sv/strings.xml[diff]
services/input/SpriteController.cpp[diff]
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java[diff]

26 files changed

tree: c6726264bde03f4c5957876921d4b15a835b2c71