# HG changeset patch
# User Thinker K.F. Li <thinker@branda.to>
# Date 1276075809 -28800
# Node ID dcd7adb2c0fc0b35c3c7e6fb9f8195f48c71d078
# Parent  aa2b388fba4eaee78b77254e4157aff5fb386cf8# Parent  13b15b7a463bbf70591aba2206fc14819494aafc
Merge from Android_Skia