tree 0f106134590f445d0ae939e9caecbb2ce102e400
parent 5d1d79a1f9d351e6f2390d844e6a7361d7d607ca
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1369427517 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1369427517 +0000

Android specific changes that are upstreamed from the android framework.

R=reed@google.com

Review URL: https://codereview.chromium.org/15720006

git-svn-id: http://skia.googlecode.com/svn/trunk@9283 2bbb7eff-a529-9590-31e7-b0007b416f81