From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 6 Feb 2012 22:45:36 +0000 (-0800)
Subject: am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a... 
X-Git-Tag: android-x86-4.4-r1~1337^2~25
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d3c1b738f7ac7e8b038c98a233ba8f80737aea5;p=android-x86%2Fframeworks-native.git

am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
  Skia API changes as a result of an update to the Skia library.
---

7d3c1b738f7ac7e8b038c98a233ba8f80737aea5