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