| commit | 60abb078e5597c9c6ceaba1ef495c4916ff4df0d | [log] [tgz] |
|---|---|---|
| author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Wed Feb 15 18:49:15 2012 +0000 |
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Wed Feb 15 18:49:15 2012 +0000 |
| tree | 7d982af583e3fdba330097f4d3597a4006493ad6 | |
| parent | 278dc6929b6481204874dcfcc055e2aaa30a95b2 [diff] |
Merge changes from the android repo upstream to Skia Review URL: https://codereview.appspot.com/5545070 git-svn-id: http://skia.googlecode.com/svn/trunk@3199 2bbb7eff-a529-9590-31e7-b0007b416f81