| commit | 7a7a5b551849e96740d434eb18e58d23563910bb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:51:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:51:01 2014 +0000 |
| tree | fbaad402c33c2fca41717930b9c644c94866bf2a | |
| parent | 3080c001b53e125ffc6b6785677bbc30e748783a [diff] | |
| parent | 966149258c0a95f390a82ada4ac95314071ff568 [diff] |
am 96614925: am 582d33aa: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD * commit '966149258c0a95f390a82ada4ac95314071ff568': Update framework to use M33 Skia. DO NOT MERGE